diff --git a/Android.mk b/Android.mk
index b06dd96..c0e61da 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,8 +20,6 @@
 # to only building on ARM if they include assembly. Individual makefiles
 # are responsible for having their own logic, for fine-grained control.
 
-LOCAL_PATH := $(call my-dir)
-
 $(eval $(call declare-copy-files-license-metadata,device/google/raviole,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
 $(eval $(call declare-copy-files-license-metadata,device/google/raviole,libnfc-nci-raven.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
 $(eval $(call declare-copy-files-license-metadata,device/google/raviole,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
@@ -38,10 +36,3 @@
 $(eval $(call declare-copy-files-license-metadata,device/google/raviole,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
 
 $(eval $(call declare-1p-copy-files,device/google/raviole,audio_policy_configuration.xml))
-
-# if some modules are built directly from this directory (not subdirectories),
-# their rules should be written here.
-
-ifeq ($(USES_DEVICE_GOOGLE_RAVIOLE),true)
-  include $(call first-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/self-extractors_oriole/Android.mk b/self-extractors_oriole/Android.mk
deleted file mode 100644
index e69de29..0000000
--- a/self-extractors_oriole/Android.mk
+++ /dev/null
diff --git a/self-extractors_oriole/google_devices/staging/Android.mk b/self-extractors_oriole/google_devices/staging/Android.mk.template
similarity index 100%
rename from self-extractors_oriole/google_devices/staging/Android.mk
rename to self-extractors_oriole/google_devices/staging/Android.mk.template
diff --git a/self-extractors_raven/Android.mk b/self-extractors_raven/Android.mk
deleted file mode 100644
index e69de29..0000000
--- a/self-extractors_raven/Android.mk
+++ /dev/null
diff --git a/self-extractors_raven/google_devices/staging/Android.mk b/self-extractors_raven/google_devices/staging/Android.mk.template
similarity index 100%
rename from self-extractors_raven/google_devices/staging/Android.mk
rename to self-extractors_raven/google_devices/staging/Android.mk.template