Merge "Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev am: 642ca632f6  -s ours" into oc-dev-plus-aosp
am: 7706a2fdd9

Change-Id: I7a3017bc5e23f6e2799ad979a26aadcf10ed8cbe