Revert "Remove dump-oat-Calculator"

This reverts commit de4f7be05813c8a32ae0d0cf9c76edc8f6cff845.

Change-Id: Id5d8dd9070197422a4e24eff45c19a592963357e
diff --git a/Android.mk b/Android.mk
index 097dd08..3e17072 100644
--- a/Android.mk
+++ b/Android.mk
@@ -274,7 +274,7 @@
 # oatdump targets
 
 .PHONY: dump-oat
-dump-oat: dump-oat-core dump-oat-boot
+dump-oat: dump-oat-core dump-oat-boot dump-oat-Calculator
 
 .PHONY: dump-oat-core
 dump-oat-core: dump-oat-core-host dump-oat-core-target
@@ -294,6 +294,12 @@
 	$(OATDUMP) --image=$(TARGET_BOOT_IMG_OUT) --output=/tmp/boot.oatdump.txt
 	@echo Output in /tmp/boot.oatdump.txt
 
+.PHONY: dump-oat-Calculator
+dump-oat-Calculator: $(TARGET_OUT_APPS)/Calculator.apk.oat $(TARGET_BOOT_IMG_OUT) $(OATDUMP)
+	$(OATDUMP) --oat-file=$< --output=/tmp/Calculator.oatdump.txt
+	@echo Output in /tmp/Calculator.oatdump.txt
+
+
 ########################################################################
 # cpplint target