Restore the original-package entry to support overwrite-install with the old package name.

Change-Id: I1ddbcb3e1b41ef7d0e4017d7de11b600ec645197

java/Android.mk

@@ -15,7 +15,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common
 
 #LOCAL_AAPT_FLAGS := -0 .dict
 # The following flag is required because we use a different package name
-# com.google.android.inputmethod.latin2 in the LatinIME sandbox.
+# com.google.android.inputmethod.latin in the LatinIME sandbox.
 LOCAL_AAPT_FLAGS := --custom-package com.android.inputmethod.latin
 
 LOCAL_SDK_VERSION := current

java/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.google.android.inputmethod.latin">
 
-    <!-- Do not override the default LatinIME for now -->
-    <!-- original-package android:name="com.android.inputmethod.latin" / -->
+    <original-package android:name="com.android.inputmethod.latin" />
 
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.READ_USER_DICTIONARY" />