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

Change-Id: I467d0b31a935fcb3e6f981dfb60f14a529ff3f51