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

Change-Id: I1e5e8ec5b347cc5cb3940a99873ef476e521cd30