diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index 562035a..d63e39f 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -60,7 +60,6 @@
     mdnsd \
     mms-common \
     requestsync \
-    screenrecord \
     telephony-common \
     voip-common \
     wifi-service
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index d343d27..8764b86 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -35,7 +35,6 @@
     libEGL \
     libETC1 \
     libFFTEm \
-    libGLES_android \
     libGLESv1_CM \
     libGLESv2 \
     libbinder \
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 6812c22..c094a92 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -43,6 +43,7 @@
     libGLESv1_CM_emulation \
     lib_renderControl_enc \
     libEGL_emulation \
+    libGLES_android \
     libGLESv2_enc \
     libOpenglSystemCommon \
     libGLESv2_emulation \
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 5905b8a..b4f2a7b 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -32,7 +32,8 @@
     bcc \
     clatd \
     clatd.conf \
-    pppd
+    pppd \
+    screenrecord
 
 PRODUCT_PACKAGES += \
     librs_jni \