Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev am: d9657ef5be  -s ours
am: 35405d22e5

Change-Id: Ide3bc9a28b9edb5d09f4d8a09dc7bee1c37ce581