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

Change-Id: Id8ef4c35c142069052801c783bcba623681fbdb1