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

Change-Id: Ia8f6c65441337953dcc5979a3e820bc240a359ee