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

Change-Id: I19d9cf8a3039cb5099d84e0ee16108a94e39fea1