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

Change-Id: I104ad2700415b253b561fe087745f2fc82b2a572