Merge & fix package names

Merge core, graphics, and misc into one
test suite as the split is unneccessary.

Also cleans up package names

Change-Id: I82da6cd69b3a52c63770465780ac98628af334ca
diff --git a/apct-tests/perftests/multiuser/AndroidManifest.xml b/apct-tests/perftests/multiuser/AndroidManifest.xml
index ace7106..adb316f 100644
--- a/apct-tests/perftests/multiuser/AndroidManifest.xml
+++ b/apct-tests/perftests/multiuser/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.multiuser.frameworks.perftests">
+        package="com.android.perftests.multiuser">
 
     <uses-permission android:name="android.permission.MANAGE_USERS" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
@@ -26,6 +26,6 @@
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
-            android:targetPackage="com.android.multiuser.frameworks.perftests"/>
+            android:targetPackage="com.android.perftests.multiuser"/>
 
-</manifest>
\ No newline at end of file
+</manifest>