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

Change-Id: Ic53b4e0b19710bb6c67c3b2c54416cd2f59bdffb