CTS Verifier Packaging and Versioning

Don't include the CTS Verifier with CTS anymore. Make the Verifier
version number independent from the CTS versioning.

- Reset the version to 2.3_r1.
- Iterate the r* number each time a new APK is uploaded.
- Version code will match the release number.

Change-Id: I0c8ca29ca409942e3d8a67f4ec705729b98d4982
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 0537d15..7c0cd5e 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CTS_APPS_LIST := \
-    CtsVerifier
-
 CTS_SECURITY_APPS_LIST := \
 	CtsAppAccessData \
 	CtsAppWithData \
@@ -75,6 +72,5 @@
 	SignatureTest \
 	ApiDemos \
 	ApiDemosReferenceTest \
-	$(CTS_APPS_LIST) \
 	$(CTS_COVERAGE_TEST_CASE_LIST) \
 	$(CTS_SECURITY_APPS_LIST)
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index ead03f2..14639d4 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.android.cts.verifier"
-      android:versionCode="3"
-      android:versionName="2.3_r5">
+      android:versionCode="1"
+      android:versionName="2.3_r1">
       
     <uses-sdk android:minSdkVersion="5"></uses-sdk>