Merge "Load default prop from /system/etc/prop.default" into oc-dr1-dev am: d334d69b70
am: 42388236a4

Change-Id: Ie8d1f695eac185e1be21073ecd3e40c0e8212d13