Merge "Revert "Move /default.prop to /system/etc/prop.default"" into oc-dev