Prepare ExactCalculator for master fishfood

- Switched back to using com.android.calculator2 package name.
- Setup to replace Calculator package.
- Replaced launcher icon with fishfood variant.

Change-Id: Ie3a74249e4d1808c50bfd86a3030e0ae61165c67
diff --git a/Android.mk b/Android.mk
index 2f3e84d..39f475e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,18 +19,17 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := cr android-support-v4
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_OVERRIDES_PACKAGES := Calculator
+LOCAL_PACKAGE_NAME := ExactCalculator
 
 LOCAL_SDK_VERSION := current
 
-LOCAL_PACKAGE_NAME := ExactCalculator
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := cr android-support-v4
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-LOCAL_AAPT_FLAGS := --rename-manifest-package com.android.exactcalculator
-
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))