test if b/65484460 is fixed.

use PoC provided with bug to verify whether fix is present.
re-integrate the same patch, which had been reverted before.
Updated to use a much smaller POC from a related bug.

Bug: 65484460
Test: ran CTS before/after patch
 (picked from I74452b76fb7a938c4e3c9b67eb4033fa52730332)

Change-Id: I77a2d72ea5b00cd9f2a5e0dbcbefc59df9761c27
diff --git a/tests/tests/security/res/raw/bug_65484460.mp4 b/tests/tests/security/res/raw/bug_65484460.mp4
new file mode 100644
index 0000000..13b37e9
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_65484460.mp4
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 46fc336..5997c09 100755
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -912,6 +912,11 @@
         doStagefrightTest(R.raw.cve_2016_6699);
     }
 
+    @SecurityTest
+    public void testStagefright_bug_65484460() throws Exception {
+        doStagefrightTest(R.raw.bug_65484460);
+    }
+
     private void doStagefrightTest(final int rid) throws Exception {
         doStagefrightTestMediaPlayer(rid);
         doStagefrightTestMediaCodec(rid);