Merge "device/qcom/msm8226: init.target.rc: add usb.chgdisabled property"
diff --git a/init.target.rc b/init.target.rc
index bfff5cb..362dc69 100644
--- a/init.target.rc
+++ b/init.target.rc
@@ -69,6 +69,10 @@
    user root
    group root
 
+service mpdecision /system/bin/mpdecision --no_sleep --avg_comp
+   user root
+   disabled
+
 service thermal-engine /system/bin/thermal-engine
    class main
    user root
diff --git a/system.prop b/system.prop
index 237b528..a09d53e 100755
--- a/system.prop
+++ b/system.prop
@@ -4,7 +4,7 @@
 
 # Use reference RIL for initial bringup
 #rild.libpath=/system/lib/libreference-ril.so
-rild.libpath=/system/lib/libril-qc-qmi-1.so
+rild.libpath=/vendor/lib/libril-qc-qmi-1.so
 rild.libargs=-d /dev/smd0
 persist.rild.nitz_plmn=
 persist.rild.nitz_long_ons_0=
@@ -70,5 +70,3 @@
 # simulate sdcard on /data/media
 #
 persist.fuse_sdcard=true
-#system prop for Bluetooth hci transport
-ro.qualcomm.bt.hci_transport=smd