Merge remote-tracking branch 'cm/cm-14.1' into cm-14.1-x86

diff --cc core/Makefile
Simple merge

diff --cc core/product.mk
Simple merge

diff --cc target/product/generic_no_telephony.mk
index d8f4588,6c23fbb..2415298
--- 1/target/product/generic_no_telephony.mk
--- 2/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@@ -37,14 -37,10 +37,9 @@@ PRODUCT_PACKAGES += 
      screenrecord
  
  PRODUCT_PACKAGES += \
-     librs_jni \
-     libvideoeditor_jni \
-     libvideoeditor_core \
-     libvideoeditor_osal \
-     libvideoeditor_videofilters \
-     libvideoeditorplayer \
+     librs_jni
  
  PRODUCT_PACKAGES += \
 -    audio.primary.default \
      audio_policy.default \
      local_time.default \
      vibrator.default \