Revert "libvpx: Pull from upstream"

source/libvpx/test/vp9_encoder_parms_get_to_decoder.cc

Index: source/libvpx/test/vp9_encoder_parms_get_to_decoder.cc
diff --git a/source/libvpx/test/vp9_encoder_parms_get_to_decoder.cc b/source/libvpx/test/vp9_encoder_parms_get_to_decoder.cc
index cdc308d6768c8d349ee78ba38ffc9f33ca0cbbb8..34e7854a9518483b1b754e5b5ff582889fafdd43 100644
--- a/source/libvpx/test/vp9_encoder_parms_get_to_decoder.cc
+++ b/source/libvpx/test/vp9_encoder_parms_get_to_decoder.cc
@@ -163,9 +163,7 @@ class Vp9EncoderParmsGetToDecoder
   EncodeParameters encode_parms;
 };
 
-// TODO(hkuang): This test conflicts with frame parallel decode. So disable it
-// for now until fix.
-TEST_P(Vp9EncoderParmsGetToDecoder, DISABLED_BitstreamParms) {
+TEST_P(Vp9EncoderParmsGetToDecoder, BitstreamParms) {
   init_flags_ = VPX_CODEC_USE_PSNR;
 
   libvpx_test::VideoSource *video;