diff --git a/Android.mk b/Android.mk
index ba490b2e35b7a47158208a99030d4cf38145a954..89e09ea094fe1f6faa6ce2d4b75f3ee711bf37e4 100755
--- a/Android.mk
+++ b/Android.mk
@@ -32,7 +32,10 @@ LOCAL_PRIVATE_PLATFORM_APIS:=true
 #LOCAL_SDK_VERSION := current
 LOCAL_RENDERSCRIPT_TARGET_API := 23
 
+#Do not override for targets using vanilla AOSP
+ifneq ($(TARGET_USES_AOSP),true)
 LOCAL_OVERRIDES_PACKAGES := Camera2
+endif
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags