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

Change-Id: Ice9637c768c0ef1bf60e603e31be3f5403c81aa3