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

Change-Id: If1f0e8c8abc7ba434b2a6b4e512eb6db36bb783f