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

Change-Id: I94450d2ddf1f8860fb9cd9f166c695f6d71f21a3