Merge "Merge "Move /default.prop to /system/etc/prop.default" into oc-dev am: fc00134c1e  -s ours am: fb4c882f29" into oc-dr1-dev-plus-aosp