Fix non-run-test jvmti cts tests

We failed to remove some BindAgentJNI calls and did not update the
manifests correctly.

Bug: 37579245
Test: cts-tradefed run cts-dev \
    --compatibility:include-filter CtsJvmtiRedefineClassesHostTestCases \
    --compatibility:include-filter CtsJvmtiTaggingHostTestCases \
    --compatibility:include-filter CtsJvmtiTrackingHostTestCases

Change-Id: If358a9e3f940f2275a9de5311059fe3e54db262b
diff --git a/hostsidetests/jvmti/allocation-tracking/AndroidTest.xml b/hostsidetests/jvmti/allocation-tracking/AndroidTest.xml
index fc26aae..84f074d 100644
--- a/hostsidetests/jvmti/allocation-tracking/AndroidTest.xml
+++ b/hostsidetests/jvmti/allocation-tracking/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiTrackingHostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiTrackingDeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.tracking" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/base/run-test-based-app/src/art/Main.java b/hostsidetests/jvmti/base/run-test-based-app/src/art/Main.java
index 27798e4..493c709 100644
--- a/hostsidetests/jvmti/base/run-test-based-app/src/art/Main.java
+++ b/hostsidetests/jvmti/base/run-test-based-app/src/art/Main.java
@@ -19,12 +19,6 @@
  * out of the ART run-tests will be used when building.
  */
 public class Main {
-    // Load the given class with the given classloader, and bind all native methods to corresponding
-    // C methods in the agent. Will abort if any of the steps fail.
-    public static native void bindAgentJNI(String className, ClassLoader classLoader);
-    // Same as above, giving the class directly.
-    public static native void bindAgentJNIForClass(Class<?> klass);
-
     // General functionality shared between tests.
     public static native void setTag(Object o, long tag);
 
diff --git a/hostsidetests/jvmti/redefining/AndroidTest.xml b/hostsidetests/jvmti/redefining/AndroidTest.xml
index f2c20ed..3bc93a2 100644
--- a/hostsidetests/jvmti/redefining/AndroidTest.xml
+++ b/hostsidetests/jvmti/redefining/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRedefineClassesHostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiRedefineClassesDeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.redefine" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/redefining/app/src/android/jvmti/cts/JvmtiRedefineClassesTest.java b/hostsidetests/jvmti/redefining/app/src/android/jvmti/cts/JvmtiRedefineClassesTest.java
index dd40eaa..d68d1dd 100644
--- a/hostsidetests/jvmti/redefining/app/src/android/jvmti/cts/JvmtiRedefineClassesTest.java
+++ b/hostsidetests/jvmti/redefining/app/src/android/jvmti/cts/JvmtiRedefineClassesTest.java
@@ -43,8 +43,6 @@
 
     @Before
     public void setUp() throws Exception {
-        Main.bindAgentJNI("android/jvmti/cts/JvmtiRedefineClassesTest",
-                getClass().getClassLoader());
         // make sure everything is cleared.
         setTransformationEvent(false);
         setPopTransformations(true);
diff --git a/hostsidetests/jvmti/tagging/AndroidTest.xml b/hostsidetests/jvmti/tagging/AndroidTest.xml
index 6d76722..2cee989 100644
--- a/hostsidetests/jvmti/tagging/AndroidTest.xml
+++ b/hostsidetests/jvmti/tagging/AndroidTest.xml
@@ -21,5 +21,7 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiTaggingHostTestCases.jar" />
+        <option name="set-option" value="test-file-name:CtsJvmtiTaggingDeviceApp.apk" />
+        <option name="set-option" value="package-name:android.jvmti.cts.tagging" />
     </test>
 </configuration>
diff --git a/hostsidetests/jvmti/tagging/app/src/android/jvmti/cts/JvmtiTaggingTest.java b/hostsidetests/jvmti/tagging/app/src/android/jvmti/cts/JvmtiTaggingTest.java
index 7c77fe7..d695f9f 100644
--- a/hostsidetests/jvmti/tagging/app/src/android/jvmti/cts/JvmtiTaggingTest.java
+++ b/hostsidetests/jvmti/tagging/app/src/android/jvmti/cts/JvmtiTaggingTest.java
@@ -31,12 +31,6 @@
  */
 public class JvmtiTaggingTest extends JvmtiTestBase {
 
-    @Before
-    public void setUp() throws Exception {
-        // Bind our native methods.
-        Main.bindAgentJNI("android/jvmti/cts/JvmtiTaggingTest", getClass().getClassLoader());
-    }
-
     private static WeakReference<Object> test() {
         Object o1 = new Object();
         Main.setTag(o1, 1);