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

Change-Id: I11773c0b8ed6727b0b225635f590337ec04dd06f