Code:  string DecodeFile(const string& filename, int num_threads) {
   libvpx_test::WebMVideoSource video(filename);
   video.Init();
 
  vpx_codec_dec_cfg_t cfg = {0};
   cfg.threads = num_threads;
   libvpx_test::VP9Decoder decoder(cfg, 0);
 
  libvpx_test::MD5 md5;
 for (video.Begin(); video.cxdata(); video.Next()) {
 const vpx_codec_err_t res =
        decoder.DecodeFrame(video.cxdata(), video.frame_size());
 if (res != VPX_CODEC_OK) {
      EXPECT_EQ(VPX_CODEC_OK, res) << decoder.DecodeError();
 break;
 }

    libvpx_test::DxDataIterator dec_iter = decoder.GetDxData();
 const vpx_image_t *img = NULL;

 while ((img = dec_iter.Next())) {
      md5.Add(img);
 }
 }

   return string(md5.Get());
 }

Vulnerability Type: DoS Exec Code Overflow Mem. Corr. 
CWE ID: CWE-119
Summary: libvpx in mediaserver in Android 4.x before 4.4.4, 5.x before 5.1.1 LMY49H, and 6.0 before 2016-03-01 allows remote attackers to execute arbitrary code or cause a denial of service (memory corruption) via a crafted media file, related to libwebm/mkvparser.cpp and other files, aka internal bug 23452792.
Commit Message: Merge Conflict Fix CL to lmp-mr1-release for ag/849478

DO NOT MERGE - libvpx: Pull from upstream

Current HEAD: 7105df53d7dc13d5e575bc8df714ec8d1da36b06

BUG=23452792

Change-Id: Ic78176fc369e0bacc71d423e0e2e6075d004aaec
