merge from tag exdroid_a10 part1

Conflicts:
	wifi/wifi.c