libvpx: Pull from upstream

source/libvpx/test/quantize_test.cc

Index: source/libvpx/test/quantize_test.cc
diff --git a/source/libvpx/test/quantize_test.cc b/source/libvpx/test/quantize_test.cc
index 53b36f3efa5cbcae1a1c8b76605e6ba3bbf4c36e..46e463dfc695892ddbb83e3e1407709cf3cc3bdc 100644
--- a/source/libvpx/test/quantize_test.cc
+++ b/source/libvpx/test/quantize_test.cc
@@ -56,7 +56,7 @@ class QuantizeTestBase {
 
     // The full configuration is necessary to generate the quantization tables.
     VP8_CONFIG vp8_config;
-    vpx_memset(&vp8_config, 0, sizeof(vp8_config));
+    memset(&vp8_config, 0, sizeof(vp8_config));
 
     vp8_comp_ = vp8_create_compressor(&vp8_config);
 
@@ -69,8 +69,7 @@ class QuantizeTestBase {
     // Copy macroblockd from the reference to get pre-set-up dequant values.
     macroblockd_dst_ = reinterpret_cast<MACROBLOCKD *>(
         vpx_memalign(32, sizeof(*macroblockd_dst_)));
-    vpx_memcpy(macroblockd_dst_, &vp8_comp_->mb.e_mbd,
-               sizeof(*macroblockd_dst_));
+    memcpy(macroblockd_dst_, &vp8_comp_->mb.e_mbd, sizeof(*macroblockd_dst_));
     // Fix block pointers - currently they point to the blocks in the reference
     // structure.
     vp8_setup_block_dptrs(macroblockd_dst_);
@@ -79,8 +78,7 @@ class QuantizeTestBase {
   void UpdateQuantizer(int q) {
     vp8_set_quantizer(vp8_comp_, q);
 
-    vpx_memcpy(macroblockd_dst_, &vp8_comp_->mb.e_mbd,
-               sizeof(*macroblockd_dst_));
+    memcpy(macroblockd_dst_, &vp8_comp_->mb.e_mbd, sizeof(*macroblockd_dst_));
     vp8_setup_block_dptrs(macroblockd_dst_);
   }