AI 144532: Change the tests' package name to be identical to its path.

Automated import of CL 144532
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 1b7abd2..54cc132 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -22,13 +22,16 @@
     </application>
 
     <instrumentation android:name="CameraLaunchPerformance"
-        android:targetPackage="com.android.camera"
-        android:label="Camera Launch Performance">
+            android:targetPackage="com.android.camera"
+            android:label="Camera Launch Performance">
     </instrumentation>
     
     <instrumentation android:name=".CameraStressTestRunner"
-         android:targetPackage="com.android.camera"
-         android:label="Camera Stress Test InstrumentationRunner">
-     </instrumentation>
+             android:targetPackage="com.android.camera"
+             android:label="Camera Stress Test InstrumentationRunner">
+    </instrumentation>
 
+    <instrumentation android:name="android.test.InstrumentationTestRunner"
+             android:targetPackage="com.android.camera"
+             android:label="Tests for Camera application."/>
 </manifest>