Rename CalculatorActivity back to Calculator

Bug: 15907395
Change-Id: Idc3445230c541bdf50cc3b15187c0776010ccff3
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6218374..3a03059 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,7 +25,7 @@
         android:theme="@style/CalculatorTheme">
 
         <activity
-            android:name="com.android.calculator2.CalculatorActivity"
+            android:name=".Calculator"
             android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>