Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev am: d9657ef5be  -s ours am: ed4a4a5ada
am: 85507e4a99

Change-Id: I7ba0ee44e3e143fd9a80e9f3dabf2c4bfae7820f