resolve merge conflicts of 634038ec02 to mnc-dev
am: 0789f022f8

Change-Id: I1095b5144dce9cb99e1e01008af0ca6a96706a7a
diff --git a/tests/tests/security/res/raw/cve_2015_3871.mp4 b/tests/tests/security/res/raw/cve_2015_3871.mp4
new file mode 100644
index 0000000..d35674c
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2015_3871.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/cve_2015_6600.mp4 b/tests/tests/security/res/raw/cve_2015_6600.mp4
new file mode 100644
index 0000000..0b9b03c
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2015_6600.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/cve_2015_6603.mp4 b/tests/tests/security/res/raw/cve_2015_6603.mp4
new file mode 100644
index 0000000..d6a4061
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2015_6603.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/cve_2015_6604.mp3 b/tests/tests/security/res/raw/cve_2015_6604.mp3
new file mode 100644
index 0000000..930f201
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2015_6604.mp3
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 b906e22..ccd6509 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -169,14 +169,6 @@
         doStagefrightTest(R.raw.bug_25765591);
     }
 
-    public void testStagefright_bug_25812590() throws Exception {
-        doStagefrightTest(R.raw.bug_25812590);
-    }
-
-    public void testStagefright_bug_26070014() throws Exception {
-        doStagefrightTest(R.raw.bug_26070014);
-    }
-
     public void testStagefright_cve_2015_3867() throws Exception {
         doStagefrightTest(R.raw.cve_2015_3867);
     }
@@ -209,6 +201,30 @@
         doStagefrightTest(R.raw.cve_2015_3873_b_21814993);
     }
 
+    public void testStagefright_bug_25812590() throws Exception {
+        doStagefrightTest(R.raw.bug_25812590);
+    }
+
+    public void testStagefright_cve_2015_6600() throws Exception {
+        doStagefrightTest(R.raw.cve_2015_6600);
+    }
+
+    public void testStagefright_cve_2015_6603() throws Exception {
+        doStagefrightTest(R.raw.cve_2015_6603);
+    }
+
+    public void testStagefright_cve_2015_6604() throws Exception {
+        doStagefrightTest(R.raw.cve_2015_6604);
+    }
+
+    public void testStagefright_cve_2015_3871() throws Exception {
+        doStagefrightTest(R.raw.cve_2015_3871);
+    }
+
+    public void testStagefright_bug_26070014() throws Exception {
+        doStagefrightTest(R.raw.bug_26070014);
+    }
+
     public void testStagefright_bug_32915871() throws Exception {
         doStagefrightTest(R.raw.bug_32915871);
     }