Merge "Move /default.prop to /system/etc/prop.default" into oc-dev am: fc00134c1e  -s ours am: 3fb7217336
am: 91111ea6ba

Change-Id: If1f408b6f885de3658b15458cd7becb60bea562e