Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation"

This reverts commit 6ca2a7dded89d14f7f937d3c2ed01960b2f0ba66.

Bug: 64342361
Change-Id: I3db25eb76327dae3cc0cb6cdb22f8d7d2af98703
diff --git a/hostsidetests/media/bitstreams/AndroidTest.xml b/hostsidetests/media/bitstreams/AndroidTest.xml
index 21b59cd..71c8519 100644
--- a/hostsidetests/media/bitstreams/AndroidTest.xml
+++ b/hostsidetests/media/bitstreams/AndroidTest.xml
@@ -25,11 +25,8 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsMediaBitstreamsTestCases.jar" />
-        <option name="runtime-hint" value="5h6m" />
+        <option name="runtime-hint" value="4h50m" />
         <!-- shard-unit must be class -->
         <option name="shard-unit" value="class" />
-        <!-- remove exclude-annotation option and use include-annotation
-          android.media.cts.bitstreams.FullPackage instead to run full package -->
-        <option name="exclude-annotation" value="android.media.cts.bitstreams.FullPackage" />
     </test>
 </configuration>