Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev
am: 642ca632f6  -s ours

Change-Id: I4dbc6a7e70277ddd910d28323d3c64aa28f8d4b0