Merge "Set the default value of pm.dexopt.shared to speed"
diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index 7aac435..f2652eb 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -53,6 +53,3 @@
 
 # Get everything else from the parent package
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)
-
-# Add adb keys to debuggable AOSP builds (if they exist)
-$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)