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