Merge "Moving libRS"
diff --git a/core/tasks/vendor_module_check.mk b/core/tasks/vendor_module_check.mk
index c2d6c78..ca0ad8d 100644
--- a/core/tasks/vendor_module_check.mk
+++ b/core/tasks/vendor_module_check.mk
@@ -22,6 +22,7 @@
invensense \
nxp \
samsung \
+ samsung_arm \
ti
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 2a65adf..d8bda3e 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -71,7 +71,7 @@
system/bluetooth/data/blacklist.conf:system/etc/bluetooth/blacklist.conf \
system/bluetooth/data/input.conf:system/etc/bluetooth/input.conf \
system/bluetooth/data/network.conf:system/etc/bluetooth/network.conf \
- frameworks/base/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf
+ frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, external/lohit-fonts/fonts.mk)