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

Change-Id: I1be94b7462977e93de5f63bafdd6e4be291bb95e