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