Code: int main(int argc, char **argv) {
 ::testing::InitGoogleTest(&argc, argv);


 #if ARCH_X86 || ARCH_X86_64
   const int simd_caps = x86_simd_caps();
   if (!(simd_caps & HAS_MMX))
    append_negative_gtest_filter(":MMX/*");
   if (!(simd_caps & HAS_SSE))
    append_negative_gtest_filter(":SSE/*");
   if (!(simd_caps & HAS_SSE2))
    append_negative_gtest_filter(":SSE2/*");
   if (!(simd_caps & HAS_SSE3))
    append_negative_gtest_filter(":SSE3/*");
   if (!(simd_caps & HAS_SSSE3))
    append_negative_gtest_filter(":SSSE3/*");
   if (!(simd_caps & HAS_SSE4_1))
    append_negative_gtest_filter(":SSE4_1/*");
   if (!(simd_caps & HAS_AVX))
    append_negative_gtest_filter(":AVX/*");
   if (!(simd_caps & HAS_AVX2))
    append_negative_gtest_filter(":AVX2/*");
 #endif
 
 #if !CONFIG_SHARED

 
 #if CONFIG_VP8
   vp8_rtcd();
#endif
 #if CONFIG_VP9
   vp9_rtcd();
#endif
#endif
 
   return RUN_ALL_TESTS();
 }

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
