Fix build: Revert "Try to catch more misuse of $(my-dir)."

This reverts commit 79e8319b2ea622d487a56498d657440f5935e9e9.

Change-Id: I7d4d352da802deea870fbe4f61f7a7023460a405
diff --git a/core/Makefile b/core/Makefile
index e7eafe8..f0e8458 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1,9 +1,5 @@
 # Put some miscellaneous rules here
 
-# HACK: clear LOCAL_PATH from including last build target before calling
-# intermedites-dir-for
-LOCAL_PATH := $(BUILD_SYSTEM)
-
 # Pick a reasonable string to use to identify files.
 ifneq "" "$(filter eng.%,$(BUILD_NUMBER))"
   # BUILD_NUMBER has a timestamp in it, which means that
@@ -654,6 +650,10 @@
 
 INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img
 
+# HACK: clear LOCAL_PATH from including last build target before calling
+# intermedites-dir-for
+LOCAL_PATH := $(call my-dir)
+
 recovery_initrc := $(call include-path-for, recovery)/etc/init.rc
 recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system
 recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img