Use Renamed replicaisland Package

Bug 5898230

Use the full package name so that Tradefed can uninstall it after
running the test. It assumes that the apk file name is the same
as the application package name.

Change-Id: Ib0a4cd3fa3e7c2e45e069e43fc85ef9fe76dfc41
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 05ec0587..8a38564 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -72,7 +72,7 @@
 	TestDeviceSetup \
 	CtsDelegatingAccessibilityService \
 	CtsDeviceAdmin \
-	replicaisland \
+	com.replica.replicaisland \
 	SignatureTest \
 	ApiDemos \
 	ApiDemosReferenceTest \
diff --git a/tests/tests/openglperf/Android.mk b/tests/tests/openglperf/Android.mk
index e510aa7..57e6ec3 100644
--- a/tests/tests/openglperf/Android.mk
+++ b/tests/tests/openglperf/Android.mk
@@ -27,7 +27,7 @@
 
 LOCAL_PACKAGE_NAME := CtsOpenGlPerfTestCases
 
-LOCAL_INSTRUMENTATION_FOR := replicaisland
+LOCAL_INSTRUMENTATION_FOR := com.replica.replicaisland
 
 LOCAL_SDK_VERSION := current
 
diff --git a/tests/tests/openglperf/AndroidManifest.xml b/tests/tests/openglperf/AndroidManifest.xml
index 8e48eb0..d687246 100644
--- a/tests/tests/openglperf/AndroidManifest.xml
+++ b/tests/tests/openglperf/AndroidManifest.xml
@@ -25,7 +25,7 @@
 
     <!-- Two activities are used -->
     <instrumentation
-        android:targetPackage="replicaisland"
+        android:targetPackage="com.replica.replicaisland"
         android:name="android.test.InstrumentationTestRunner" />
     <instrumentation
         android:targetPackage="com.android.cts.openglperf"