fireball: remove duplicate wpa_supplicant.conf
fireball: clean out system.prop
Merge remote-tracking branch 'iv/cm-10.1'