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