htc one fixes

Conflicts:
	include/hardware_legacy/wifi.h