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

Change-Id: I5f1ec0968a7e53beb6fd7740f0aed0951988df4a