Remove poc dependency on AndroidTest.java

Bug: 171320823
Test: run all of STS
Change-Id: If2107a21dbc2dd112dfc1b760dfe5c13f98dee59
Merged-In: If2107a21dbc2dd112dfc1b760dfe5c13f98dee59
diff --git a/hostsidetests/securitybulletin/AndroidTest.xml b/hostsidetests/securitybulletin/AndroidTest.xml
index b875ccd..4ce62f1 100644
--- a/hostsidetests/securitybulletin/AndroidTest.xml
+++ b/hostsidetests/securitybulletin/AndroidTest.xml
@@ -15,358 +15,12 @@
 -->
 <configuration description="Config for the CTS Security bulletin host tests">
     <option name="config-descriptor:metadata" key="component" value="security" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
-        <option name="cleanup" value="true" />
-        <!--__________________-->
-        <!--    Utilities     -->
-        <option name="push" value="pacrunner->/data/local/tmp/pacrunner" />
-
-        <option name="push" value="CVE-2016-8460->/data/local/tmp/CVE-2016-8460" />
-        <option name="push" value="CVE-2016-8482->/data/local/tmp/CVE-2016-8482" />
-        <option name="push" value="CVE-2016-6730->/data/local/tmp/CVE-2016-6730" />
-        <option name="push" value="CVE-2016-6731->/data/local/tmp/CVE-2016-6731" />
-        <option name="push" value="CVE-2016-6732->/data/local/tmp/CVE-2016-6732" />
-        <option name="push" value="CVE-2016-6733->/data/local/tmp/CVE-2016-6733" />
-        <option name="push" value="CVE-2016-6734->/data/local/tmp/CVE-2016-6734" />
-        <option name="push" value="CVE-2016-6735->/data/local/tmp/CVE-2016-6735" />
-        <option name="push" value="CVE-2016-6736->/data/local/tmp/CVE-2016-6736" />
-        <option name="push" value="CVE-2016-8425->/data/local/tmp/CVE-2016-8425" />
-        <option name="push" value="CVE-2016-8426->/data/local/tmp/CVE-2016-8426" />
-        <option name="push" value="CVE-2016-8427->/data/local/tmp/CVE-2016-8427" />
-        <option name="push" value="CVE-2016-8428->/data/local/tmp/CVE-2016-8428" />
-        <option name="push" value="CVE-2016-8429->/data/local/tmp/CVE-2016-8429" />
-        <option name="push" value="CVE-2016-8430->/data/local/tmp/CVE-2016-8430" />
-        <option name="push" value="CVE-2016-8431->/data/local/tmp/CVE-2016-8431" />
-        <option name="push" value="CVE-2016-8432->/data/local/tmp/CVE-2016-8432" />
-        <option name="push" value="CVE-2016-8434->/data/local/tmp/CVE-2016-8434" />
-
-        <!-- Bulletin 2015-10 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2015-3873->/data/local/tmp/CVE-2015-3873" />
-
-        <!-- Bulletin 2015-12 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2015-6616->/data/local/tmp/CVE-2015-6616" />
-        <option name="push" value="CVE-2015-6626->/data/local/tmp/CVE-2015-6626" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-02 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-0811->/data/local/tmp/CVE-2016-0811" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-04 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-2412->/data/local/tmp/CVE-2016-2412" />
-        <option name="push" value="CVE-2016-2413->/data/local/tmp/CVE-2016-2413" />
-        <option name="push" value="CVE-2016-0844->/data/local/tmp/CVE-2016-0844" />
-        <option name="push" value="CVE-2016-2419->/data/local/tmp/CVE-2016-2419" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-05 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-2450->/data/local/tmp/CVE-2016-2450" />
-        <option name="push" value="CVE-2016-2451->/data/local/tmp/CVE-2016-2451" />
-        <option name="push" value="CVE-2016-2460->/data/local/tmp/CVE-2016-2460" />
-        <option name="push" value="CVE-2015-1805->/data/local/tmp/CVE-2015-1805" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-06 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-2485->/data/local/tmp/CVE-2016-2485" />
-        <option name="push" value="CVE-2016-2478->/data/local/tmp/CVE-2016-2478" />
-        <option name="push" value="CVE-2016-2482->/data/local/tmp/CVE-2016-2482" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-07 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2014-9803->/data/local/tmp/CVE-2014-9803" />
-        <option name="push" value="CVE-2016-3746->/data/local/tmp/CVE-2016-3746" />
-        <option name="push" value="CVE-2016-3747->/data/local/tmp/CVE-2016-3747" />
-        <option name="push" value="CVE-2016-3818->/data/local/tmp/CVE-2016-3818" />
-
-        <!-- Bulletin 2016-09 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-3871->/data/local/tmp/CVE-2016-3871" />
-        <option name="push" value="CVE-2016-2471->/data/local/tmp/CVE-2016-2471" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-10 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-3913->/data/local/tmp/CVE-2016-3913" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-11 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2012-6702->/data/local/tmp/CVE-2012-6702" />
-
-        <!--__________________-->
-        <!-- Bulletin 2016-12 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-6758->/data/local/tmp/CVE-2016-6758" />
-        <option name="push" value="CVE-2016-6759->/data/local/tmp/CVE-2016-6759" />
-
-        <!--__________________-->
-        <!-- Bulletin 2017-01 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0386->/data/local/tmp/CVE-2017-0386" />
-
-        <!--__________________-->
-        <!-- Bulletin 2017-02 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0415->/data/local/tmp/CVE-2017-0415" />
-        <option name="push" value="CVE-2017-0426->/data/local/tmp/CVE-2017-0426" />
-
-        <!--__________________-->
-        <!-- Bulletin 2017-03 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0477->/data/local/tmp/CVE-2017-0477" />
-        <option name="push" value="CVE-2017-0479->/data/local/tmp/CVE-2017-0479" />
-        <option name="push" value="CVE-2017-0334->/data/local/tmp/CVE-2017-0334" />
-        <option name="push" value="CVE-2016-8479->/data/local/tmp/CVE-2016-8479" />
-        <option name="push" value="CVE-2017-0508->/data/local/tmp/CVE-2017-0508" />
-        <option name="push" value="CVE-2017-0333->/data/local/tmp/CVE-2017-0333" />
-
-        <!--__________________-->
-        <!-- Bulletin 2017-04 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-10244->/data/local/tmp/CVE-2016-10244" />
-        <option name="push" value="CVE-2016-10229->/data/local/tmp/CVE-2016-10229" />
-        <option name="push" value="CVE-2014-3145->/data/local/tmp/CVE-2014-3145"/>
-        <option name="push" value="CVE-2017-0553->/data/local/tmp/CVE-2017-0553"/>
-
-        <!--__________________-->
-        <!-- Bulletin 2017-05 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0597->/data/local/tmp/CVE-2017-0597" />
-        <option name="push" value="CVE-2016-5862->/data/local/tmp/CVE-2016-5862"/>
-        <option name="push" value="CVE-2016-5867->/data/local/tmp/CVE-2016-5867"/>
-
-        <!--__________________-->
-        <!-- Bulletin 2017-06 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2016-4658->/data/local/tmp/CVE-2016-4658" />
-        <option name="push" value="CVE-2016-5131->/data/local/tmp/CVE-2016-5131" />
-        <option name="push" value="CVE-2016-8332->/data/local/tmp/CVE-2016-8332" />
-
-        <!--__________________-->
-        <!-- Bulletin 2017-07 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0697->/data/local/tmp/CVE-2017-0697"/>
-        <option name="push" value="CVE-2017-0678->/data/local/tmp/CVE-2017-0678"/>
-        <option name="push" value="CVE-2016-2109->/data/local/tmp/CVE-2016-2109"/>
-
-        <!--__________________-->
-        <!-- Bulletin 2017-08 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0726->/data/local/tmp/CVE-2017-0726"/>
-        <option name="push" value="CVE-2017-0713->/data/local/tmp/CVE-2017-0713"/>
-
-        <!--__________________-->
-        <!-- Bulletin 2017-09 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0670->/data/local/tmp/CVE-2017-0670" />
-        <option name="push" value="Bug-38195738->/data/local/tmp/Bug-38195738" />
-        <option name="push" value="CVE-2017-11041->/data/local/tmp/CVE-2017-11041" />
-
-        <!--__________________-->
-        <!-- Bulletin 2017-10 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-0814->/data/local/tmp/CVE-2017-0814" />
-
-        <!--__________________-->
-        <!-- Bulletin 2017-11 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-
-        <!--__________________-->
-        <!-- Bulletin 2017-12 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-14904->/data/local/tmp/CVE-2017-14904" />
-        <option name="push" value="CVE-2017-6262->/data/local/tmp/CVE-2017-6262" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-01 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-13180->/data/local/tmp/CVE-2017-13180" />
-        <option name="push" value="CVE-2017-0817->/data/local/tmp/CVE-2017-0817" />
-        <option name="push" value="CVE-2018-9527->/data/local/tmp/CVE-2018-9527" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-02 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-13234->/data/local/tmp/CVE-2017-13234" />
-        <option name="push" value="CVE-2017-0837->/data/local/tmp/CVE-2017-0837" />
-        <option name="push" value="CVE-2017-13273->/data/local/tmp/CVE-2017-13273" />
-        <option name="push" value="CVE-2017-13232->/data/local/tmp/CVE-2017-13232" />
-        <option name="push" value="CVE-2017-17767->/data/local/tmp/CVE-2017-17767" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-03 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2017-13253->/data/local/tmp/CVE-2017-13253" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-06 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2018-9344->/data/local/tmp/CVE-2018-9344" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-07 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2018-9428->/data/local/tmp/CVE-2018-9428" />
-        <option name="push" value="CVE-2018-9424->/data/local/tmp/CVE-2018-9424" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-09 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2018-9466-CVE-2017-9047->/data/local/tmp/CVE-2018-9466-CVE-2017-9047" />
-        <option name="push" value="CVE-2018-9466-CVE-2017-9048->/data/local/tmp/CVE-2018-9466-CVE-2017-9048" />
-        <option name="push" value="CVE-2018-9466-CVE-2017-9049->/data/local/tmp/CVE-2018-9466-CVE-2017-9049" />
-        <option name="push" value="CVE-2018-9472->/data/local/tmp/CVE-2018-9472" />
-        <option name="push" value="CVE-2018-11261->/data/local/tmp/CVE-2018-11261" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-10 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2018-9491->/data/local/tmp/CVE-2018-9491" />
-        <option name="push" value="CVE-2018-9515->/data/local/tmp/CVE-2018-9515" />
-
-        <!--__________________-->
-        <!-- Bulletin 2018-11 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2018-9539->/data/local/tmp/CVE-2018-9539" />
-
-        <!--__________________-->
-        <!-- Bulletin 2019-02 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2019-1988->/data/local/tmp/CVE-2019-1988" />
-
-        <!--__________________-->
-        <!-- Bulletin 2019-03 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2019-2007->/data/local/tmp/CVE-2019-2007" />
-        <option name="push" value="Bug-115739809->/data/local/tmp/Bug-115739809" />
-        <option name="push" value="CVE-2019-2025->/data/local/tmp/CVE-2019-2025" />
-
-        <!--__________________-->
-        <!-- Bulletin 2019-08 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2019-2133->/data/local/tmp/CVE-2019-2133" />
-        <option name="push" value="CVE-2019-2134->/data/local/tmp/CVE-2019-2134" />
-        <option name="push" value="CVE-2019-2126->/data/local/tmp/CVE-2019-2126" />
-
-        <!--__________________-->
-        <!-- Bulletin 2019-10 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2019-2184->/data/local/tmp/CVE-2019-2184" />
-
-        <!-- Bulletin 2019-12 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2019-2228->/data/local/tmp/CVE-2019-2228" />
-
-        <!--__________________-->
-        <!-- Bulletin 2020-01 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2020-0007->/data/local/tmp/CVE-2020-0007" />
-
-        <!--__________________-->
-        <!-- Bulletin 2020-03 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2020-0069->/data/local/tmp/CVE-2020-0069" />
-
-        <!-- Bulletin 2020-05 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2020-0101->/data/local/tmp/CVE-2020-0101" />
-
-        <!--__________________-->
-        <!-- Bulletin 2020-10 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2020-0408->/data/local/tmp/CVE-2020-0408" />
-        <option name="push" value="CVE-2020-0421->/data/local/tmp/CVE-2020-0421" />
-
-        <!--__________________-->
-        <!-- Bulletin 2020-11 -->
-        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
-        <option name="push" value="CVE-2020-0450->/data/local/tmp/CVE-2020-0450" />
-        <option name="push" value="CVE-2020-0409->/data/local/tmp/CVE-2020-0409" />
-
-        <option name="append-bitness" value="true" />
-    </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsHostLaunchAnyWhereApp.apk" />
     </target_preparer>
 
-    <!-- Support for 64-bit software codecs has been deprecated,                          -->
-    <!-- Hence tests which use them will be built only for 32-bit architectures.          -->
-    <!-- The default 'target_preparer' tries to copy both 64-bit and 32-bit binaries as   -->
-    <!-- 'append=bitness' value is set to 'true'. In order to ensure that that only       -->
-    <!-- 32-bit binaries are copied, a new 'target_preparer' section is added with        -->
-    <!-- 'append-bitness' value set to false and additionally '32' has been added in the  -->
-    <!-- end after the bug id. This ensures that it does not try to copy the unavailable  -->
-    <!-- 64-bit binary.                                                                   -->
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
-        <option name="cleanup" value="true" />
-
-        <option name="push" value="testhevc32->/data/local/tmp/testhevc" />
-        <option name="push" value="testavc32->/data/local/tmp/testavc" />
-        <option name="push" value="testmpeg232->/data/local/tmp/testmpeg2" />
-        <option name="push" value="testhevc_mem132->/data/local/tmp/testhevc_mem1" />
-        <option name="push" value="testavc_mem132->/data/local/tmp/testavc_mem1" />
-        <option name="push" value="testmpeg2_mem132->/data/local/tmp/testmpeg2_mem1" />
-        <option name="push" value="testhevc_mem232->/data/local/tmp/testhevc_mem2" />
-        <option name="push" value="testavc_mem232->/data/local/tmp/testavc_mem2" />
-        <option name="push" value="testmpeg2_mem232->/data/local/tmp/testmpeg2_mem2" />
-        <option name="push" value="CVE-2017-068432->/data/local/tmp/CVE-2017-0684" />
-
-        <option name="append-bitness" value="false" />
-    </target_preparer>
-
-    <!-- This PoC only hits with the 32-bit binary. Only push 32 for 64 and 32-bit arches -->
-    <!-- This section is reserved for OMX tests that need to be 32-bit so they can get a  -->
-    <!-- proper OMX instance. 64-bit PoCs don't get it and therefore don't hit the vuln.  -->
-    <!-- All tests in this section should take care to only build the 32-bit binary.      -->
-    <!-- In order to pass tradefed presubmit ValidateTestsAbi, add an exception.          -->
-    <!-- For more details, visit b/127856694                                              -->
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
-        <option name="cleanup" value="true" />
-
-        <option name="push" value="CVE-2018-626732->/data/local/tmp/CVE-2018-6267" />
-        <option name="push" value="CVE-2018-627132->/data/local/tmp/CVE-2018-6271" />
-        <option name="push" value="CVE-2018-934932->/data/local/tmp/CVE-2018-9349" />
-
-        <option name="append-bitness" value="false" />
-    </target_preparer>
-
-    <!-- The following tests hit either 32-bit or 64-bit, but not both. All tests in this -->
-    <!-- section should take care to build either 32 bit or 64 bit binary, but not both.  -->
-    <!-- In order to pass tradefed presubmit ValidateTestsAbi, add an exception.          -->
-    <!-- For more details, visit b/127856694                                              -->
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
-        <option name="cleanup" value="true" />
-
-        <!-- Please add 32-bit binary tests below to avoid merge conflict -->
-        <option name="push" value="CVE-2015-6616-232->/data/local/tmp/CVE-2015-6616-2" />
-        <option name="push" value="CVE-2019-217632->/data/local/tmp/CVE-2019-2176" />
-        <option name="push" value="CVE-2020-000232->/data/local/tmp/CVE-2020-0002" />
-        <option name="push" value="CVE-2017-1317932->/data/local/tmp/CVE-2017-13179" />
-        <option name="push" value="CVE-2017-083332->/data/local/tmp/CVE-2017-0833" />
-        <option name="push" value="CVE-2017-083232->/data/local/tmp/CVE-2017-0832" />
-        <option name="push" value="CVE-2017-1315032->/data/local/tmp/CVE-2017-13150" />
-        <option name="push" value="CVE-2017-1318932->/data/local/tmp/CVE-2017-13189" />
-        <option name="push" value="CVE-2017-084032->/data/local/tmp/CVE-2017-0840" />
-        <option name="push" value="CVE-2017-1324132->/data/local/tmp/CVE-2017-13241" />
-        <option name="push" value="CVE-2016-390932->/data/local/tmp/CVE-2016-3909" />
-        <option name="push" value="CVE-2017-1319032->/data/local/tmp/CVE-2017-13190" />
-        <option name="push" value="CVE-2017-1314932->/data/local/tmp/CVE-2017-13149" />
-
-        <!-- Please add 64-bit binary tests below to avoid merge conflict -->
-
-
-        <option name="append-bitness" value="false" />
-    </target_preparer>
-
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="OomCatcher.apk" />
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/Poc18_06.java b/hostsidetests/securitybulletin/src/android/security/cts/Poc18_06.java
index fb2a95a..ce21c1d 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/Poc18_06.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/Poc18_06.java
@@ -49,6 +49,7 @@
     @SecurityTest
     public void testPocCVE_2018_9349() throws Exception {
         getOomCatcher().setHighMemoryTest();
+        pocPusher.only32();
         AdbUtils.pushResource(
                 "/CVE-2018-9349.yuv", "/data/local/tmp/CVE-2018-9349.yuv", getDevice());
         AdbUtils.runPocAssertNoCrashes("CVE-2018-9349", getDevice(), "mediaserver");
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/Poc19_02.java b/hostsidetests/securitybulletin/src/android/security/cts/Poc19_02.java
index 2182033..7b28a1a 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/Poc19_02.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/Poc19_02.java
@@ -32,6 +32,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2019-02")
     public void testPocCVE_2018_6267() throws Exception {
+        pocPusher.only32();
         AdbUtils.runPocAssertNoCrashes("CVE-2018-6267", getDevice(), "mediaserver");
     }
 
@@ -41,6 +42,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2019-02")
     public void testPocCVE_2018_6271() throws Exception {
+        pocPusher.only32();
         AdbUtils.runPocAssertNoCrashes("CVE-2018-6271", getDevice(), "mediaserver");
     }
 }
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java b/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java
index c5c4ed9..bedccaf 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/TestMedia.java
@@ -43,6 +43,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2017-07")
     public void testPocCVE_2017_0684() throws Exception {
+        pocPusher.only32();
         String processPatternStrings[] = {"mediaserver", "omx@1.0-service"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-0684", null, getDevice(),
                 processPatternStrings);
@@ -60,6 +61,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2019-09")
     public void testPocCVE_2019_2179() throws Exception {
+        pocPusher.only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2019-2179", null, getDevice());
     }
 
@@ -375,6 +377,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2015-12")
     public void testPocCVE_2015_6616_2() throws Exception {
+        pocPusher.only32();
         String inputFiles[] = {"cve_2015_6616_2.mp4"};
         String binaryName = "CVE-2015-6616-2";
         String signals[] = {CrashUtils.SIGSEGV, CrashUtils.SIGBUS, CrashUtils.SIGABRT};
@@ -394,6 +397,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2019-09")
     public void testPocCVE_2019_2176() throws Exception {
+        pocPusher.only32();
         String inputFiles[] = {"cve_2019_2176.mp4"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2019-2176",
                 AdbUtils.TMP_PATH + inputFiles[0], inputFiles, AdbUtils.TMP_PATH, getDevice());
@@ -406,6 +410,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2020-01")
     public void testPocCVE_2020_0002() throws Exception {
+        pocPusher.only32();
         String inputFiles[] = {"cve_2020_0002.mp4"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2020-0002",
                 AdbUtils.TMP_PATH + inputFiles[0], inputFiles, AdbUtils.TMP_PATH, getDevice());
@@ -541,6 +546,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2018-01")
     public void testPocCVE_2017_13179() throws Exception {
+        pocPusher.only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-13179", null, getDevice());
     }
 
@@ -625,6 +631,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2018-01")
     public void testPocCVE_2017_13189() throws Exception {
+        pocPusher.only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-13189", null, getDevice());
     }
 
@@ -635,6 +642,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2017-11")
     public void testPocCVE_2017_0840() throws Exception {
+        pocPusher.only32();
         String processPatternStrings[] = {"mediaserver", "omx@\\d+?\\.\\d+?-service"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-0840", null, getDevice(),
                 processPatternStrings);
@@ -647,6 +655,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2018-02")
     public void testPocCVE_2017_13241() throws Exception {
+        pocPusher.only32();
         String processPatternStrings[] = {"mediaserver", "omx@\\d+?\\.\\d+?-service"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-13241", null, getDevice(),
                 processPatternStrings);
@@ -659,6 +668,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2016-10")
     public void testPocCVE_2016_3909() throws Exception {
+        pocPusher.only32();
         String processPatternStrings[] = {"mediaserver", "omx@\\d+?\\.\\d+?-service"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2016-3909", null, getDevice(),
                 processPatternStrings);
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java b/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java
index c2ba18d..3ecf567 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java
@@ -93,6 +93,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2018-01")
     public void testPocCVE_2017_13177() throws Exception {
+        pocPusher.only32();
         String inputFiles[] = {"cve_2017_13177.hevc"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-13177",
                 "-i " + AdbUtils.TMP_PATH + inputFiles[0] + " --num_frames -1", inputFiles,
@@ -132,6 +133,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2017-04")
     public void testPocCVE_2017_13149() throws Exception {
+        pocPusher.only32();
         String inputFiles[] = {"cve_2017_13149.hevc"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-13149",
                 AdbUtils.TMP_PATH + inputFiles[0], inputFiles, AdbUtils.TMP_PATH, getDevice());
@@ -143,6 +145,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2018-01")
     public void testPocCVE_2017_13190() throws Exception {
+        pocPusher.only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-13190", null, null, AdbUtils.TMP_PATH,
                 getDevice());
     }
@@ -214,6 +217,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2017-07")
     public void testPocCVE_2017_0677() throws Exception {
+        pocPusher.only32();
         String inputFiles[] = {"cve_2017_0677.h264"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-0677",
                 "-i " + AdbUtils.TMP_PATH + inputFiles[0] + " -o /dev/null", inputFiles,
@@ -305,6 +309,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2017-11")
     public void testPocCVE_2017_0833() throws Exception {
+        pocPusher.only32();
         String inputFiles[] = {"cve_2017_0833.h264"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-0833",
                 "-i " + AdbUtils.TMP_PATH + inputFiles[0] + " --num_frames -1 --num_cores 2",
@@ -335,6 +340,7 @@
     @SecurityTest(minPatchLevel = "2017-12")
     public void testPocCVE_2017_13150() throws Exception {
         getOomCatcher().setHighMemoryTest();
+        pocPusher.only32();
         String inputFiles[] = {"cve_2017_13150.m2v"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-13150",
                 AdbUtils.TMP_PATH + inputFiles[0], inputFiles, AdbUtils.TMP_PATH, getDevice());
@@ -396,6 +402,7 @@
      **/
     @SecurityTest(minPatchLevel = "2019-04")
     public void testPocCVE_2019_2028() throws Exception {
+        pocPusher.only32();
         String inputFiles[] = {"cve_2019_2028.m2v"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2019-2028",
                 "-i " + AdbUtils.TMP_PATH + inputFiles[0] + " --num_frames -1", inputFiles,
@@ -476,6 +483,7 @@
     @Test
     @SecurityTest(minPatchLevel = "2017-11")
     public void testPocCVE_2017_0832() throws Exception {
+        pocPusher.only32();
         String inputFiles[] = {"cve_2017_0832.m2v"};
         AdbUtils.runPocAssertNoCrashesNotVulnerable("CVE-2017-0832",
                 "-i " + AdbUtils.TMP_PATH + inputFiles[0] + " --num_frames -1 --num_cores 2",
@@ -492,6 +500,7 @@
      */
     public static void runHevcDecodeTest(String inputFiles[], String arguments, ITestDevice device)
             throws Exception {
+        getPocPusher(device).only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable(HEVCDEC_BINARY, arguments, inputFiles,
                 AdbUtils.TMP_PATH, device);
     }
@@ -506,6 +515,7 @@
      */
     public static void runMpeg2DecodeTest(String inputFiles[], String arguments, ITestDevice device)
             throws Exception {
+        getPocPusher(device).only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable(MPEG2DEC_BINARY, arguments, inputFiles,
                 AdbUtils.TMP_PATH, device);
     }
@@ -520,6 +530,7 @@
      */
     public static void runAvcDecodeTest(String inputFiles[], String arguments, ITestDevice device)
             throws Exception {
+        getPocPusher(device).only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable(AVCDEC_BINARY, arguments, inputFiles,
                 AdbUtils.TMP_PATH, device);
     }
@@ -547,6 +558,7 @@
      */
     public static void runHevcDecodeMemOverflowTest(String inputFiles[], String arguments,
             ITestDevice device) throws Exception {
+        getPocPusher(device).only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable(HEVCDEC_MEMOVERFLOW_BINARY, arguments,
                 inputFiles, AdbUtils.TMP_PATH, device);
     }
@@ -561,6 +573,7 @@
      */
     public static void runHevcDecodeMemUnderflowTest(String inputFiles[], String arguments,
             ITestDevice device) throws Exception {
+        getPocPusher(device).only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable(HEVCDEC_MEMUNDERFLOW_BINARY, arguments,
                 inputFiles, AdbUtils.TMP_PATH, device);
     }
@@ -588,6 +601,7 @@
      */
     public static void runMpeg2DecodeMemOverflowTest(String inputFiles[], String arguments,
             ITestDevice device) throws Exception {
+        getPocPusher(device).only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable(MPEG2DEC_MEMOVERFLOW_BINARY, arguments,
                 inputFiles, AdbUtils.TMP_PATH, device);
     }
@@ -602,6 +616,7 @@
      */
     public static void runMpeg2DecodeMemUnderflowTest(String inputFiles[], String arguments,
             ITestDevice device) throws Exception {
+        getPocPusher(device).only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable(MPEG2DEC_MEMUNDERFLOW_BINARY, arguments,
                 inputFiles, AdbUtils.TMP_PATH, device);
     }
@@ -629,6 +644,7 @@
      */
     public static void runAvcDecodeMemOverflowTest(String inputFiles[], String arguments,
             ITestDevice device) throws Exception {
+        getPocPusher(device).only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable(AVCDEC_MEMOVERFLOW_BINARY, arguments,
                 inputFiles, AdbUtils.TMP_PATH, device);
     }
@@ -643,6 +659,7 @@
      */
     public static void runAvcDecodeMemUnderflowTest(String inputFiles[], String arguments,
             ITestDevice device) throws Exception {
+        getPocPusher(device).only32();
         AdbUtils.runPocAssertNoCrashesNotVulnerable(AVCDEC_MEMUNDERFLOW_BINARY, arguments,
                 inputFiles, AdbUtils.TMP_PATH, device);
     }