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
am: 0aaae58144

Change-Id: Ic9bf841059e083a65ae26ca3c29f828fe9c94991