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

Change-Id: I1171900e86d995772563d91516f5bc2f85a76b84