libvpx: Pull from upstream

source/libvpx/vp8/encoder/bitstream.c

Index: source/libvpx/vp8/encoder/bitstream.c
diff --git a/source/libvpx/vp8/encoder/bitstream.c b/source/libvpx/vp8/encoder/bitstream.c
index f9096f9f01f3cb82a41269512fa5eda02abc09e5..ea279b321819d81c38d3b3b6b7d707e3ebd5e983 100644
--- a/source/libvpx/vp8/encoder/bitstream.c
+++ b/source/libvpx/vp8/encoder/bitstream.c
@@ -1543,7 +1543,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned char * dest
     if (pc->refresh_entropy_probs == 0)
     {
         /* save a copy for later refresh */
-        vpx_memcpy(&cpi->common.lfc, &cpi->common.fc, sizeof(cpi->common.fc));
+        memcpy(&cpi->common.lfc, &cpi->common.fc, sizeof(cpi->common.fc));
     }
 
     vp8_update_coef_probs(cpi);
@@ -1620,7 +1620,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned char * dest
             /* concatenate partition buffers */
             for(i = 0; i < num_part; i++)
             {
-                vpx_memmove(dp, cpi->partition_d[i+1], cpi->partition_sz[i+1]);
+                memmove(dp, cpi->partition_d[i+1], cpi->partition_sz[i+1]);
                 cpi->partition_d[i+1] = dp;
                 dp += cpi->partition_sz[i+1];
             }