[automerger] Revert "CTS test for Android Security b/24157524" am: 40495120a0 am: e0f178fe36

Change-Id: Id27ea17cb215b30e723404b3aa07f214aa498cd9
diff --git a/tests/tests/security/res/raw/bug_24157524.mp4 b/tests/tests/security/res/raw/bug_24157524.mp4
deleted file mode 100644
index f2da774..0000000
--- a/tests/tests/security/res/raw/bug_24157524.mp4
+++ /dev/null
Binary files differ
diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index d14581d..25a6f39 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -667,11 +667,6 @@
         doStagefrightTest(R.raw.cve_2015_6604);
     }
 
-    @SecurityTest(minPatchLevel = "2015-12")
-    public void testStagefright_bug_24157524() throws Exception {
-        doStagefrightTest(R.raw.bug_24157524);
-    }
-
     @SecurityTest(minPatchLevel = "2015-10")
     public void testStagefright_cve_2015_3871() throws Exception {
         doStagefrightTest(R.raw.cve_2015_3871);