Fix Xiaomi wifi mac address

Conflicts:
	wifi/Android.mk
	wifi/wifi.c
armani: fix conflicts