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

Change-Id: I91597e28529560d19525a4302fbf69206ebde9c4