Remove incorrect entries in AndroidTest.xml

Bug: 170967640
Test: ensure referenced tests are purely leftovers in the xml
Change-Id: I820f8b2cf2718c1759a9fb38c218373185a700d1
Merged-In: Ic4f298d74f1830db793fc6a7afd288e072bd41ab
diff --git a/hostsidetests/securitybulletin/AndroidTest.xml b/hostsidetests/securitybulletin/AndroidTest.xml
index f574a21..56cffb6 100644
--- a/hostsidetests/securitybulletin/AndroidTest.xml
+++ b/hostsidetests/securitybulletin/AndroidTest.xml
@@ -22,10 +22,7 @@
         <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-2017-0403->/data/local/tmp/CVE-2017-0403" />
-        <option name="push" value="CVE-2017-0404->/data/local/tmp/CVE-2017-0404" />
         <option name="push" value="CVE-2016-8482->/data/local/tmp/CVE-2016-8482" />
-        <option name="push" value="CVE-2017-0429->/data/local/tmp/CVE-2017-0429" />
         <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" />
@@ -43,12 +40,6 @@
         <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" />
 
-        <!-- Media Codec Tests -->
-        <!-- Please add tests for media codecs below to avoid merge conflict -->
-        <option name="push" value="testhevcdec->/data/local/tmp/testhevcdec" />
-        <option name="push" value="testavcdec->/data/local/tmp/testavcdec" />
-        <option name="push" value="testmpeg2dec->/data/local/tmp/testmpeg2dec" />
-
         <!-- 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" />