Merge "Load default prop from /system/etc/prop.default" into oc-dev-plus-aosp am: eb274d47e7  -s ours
am: cf5f11d769  -s ours

Change-Id: I65e5f22f50f2985668050a1bf7f0751d7c705d45