diff --git a/core/legacy_prebuilts.mk b/core/legacy_prebuilts.mk
index b11f064..53328b3 100644
--- a/core/legacy_prebuilts.mk
+++ b/core/legacy_prebuilts.mk
@@ -27,7 +27,6 @@
 	ap_gain.bin \
 	audio.conf \
 	auto_pairing.conf \
-	AVRCP.kl \
 	baseline11k.par \
 	baseline8k.par \
 	baseline.par \
@@ -43,7 +42,6 @@
 	cdt.bin \
 	chat-ril \
 	cmu6plus.ok.zip \
-	cpcap-key.kl \
 	data \
 	dbus.conf \
 	dev \
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 69e8d84..6635d2c 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -57,6 +57,7 @@
         system/bluetooth/data/network.conf:system/etc/bluetooth/network.conf
 
 $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
+$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
 
 # Overrides
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 14f75fa..b856b11 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -121,6 +121,7 @@
 	frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml
 
 $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
+$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
 
 # Overrides