Merge "Fix hard-coded path that broke ril on 64 bit builds"
diff --git a/shared/phone/device.mk b/shared/phone/device.mk
index 4d7a969..440e3e2 100644
--- a/shared/phone/device.mk
+++ b/shared/phone/device.mk
@@ -25,7 +25,7 @@
     gsm.sim.operator.iso-country=us \
     gsm.sim.operator.numeric=310260 \
     keyguard.no_require_sim=true \
-    rild.libpath=/vendor/lib/libvsoc-ril.so \
+    rild.libpath=libvsoc-ril.so \
     ro.cdma.home.operator.alpha=Android \
     ro.cdma.home.operator.numeric=310260 \
     ro.com.android.dataroaming=true \
diff --git a/shared/tablet_3g/device.mk b/shared/tablet_3g/device.mk
index 44b0a80..dec346d 100644
--- a/shared/tablet_3g/device.mk
+++ b/shared/tablet_3g/device.mk
@@ -25,7 +25,7 @@
     gsm.sim.operator.iso-country=us \
     gsm.sim.operator.numeric=310260 \
     keyguard.no_require_sim=true \
-    rild.libpath=/vendor/lib/libvsoc-ril.so \
+    rild.libpath=libvsoc-ril.so \
     ro.cdma.home.operator.alpha=Android \
     ro.cdma.home.operator.numeric=310260 \
     ro.com.android.dataroaming=true \