Merge "Load default prop from /system/etc/prop.default" into oc-dr1-dev