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

Change-Id: I87edf2c4edef237b610d47ae903d1323662ff164