Merge "Move /default.prop to /system/etc/prop.default" into oc-dev am: fc00134c1e  -s ours
am: 3fb7217336

Change-Id: I346ac636aa90c288dc688714efc97ab33b5b5285