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

Change-Id: Id76f0a2076cca32a6090342a16dddfed070e82de