Merge "Load default prop from /system/etc/prop.default" into oc-dev am: 0af496af01  -s ours am: fbdbbeff82
am: 63b84d2c29

Change-Id: I19aaac641db46c703ddaebcf9d6c18828a90ed5c