Fix broken build and some more functionality

Build is broken because some changes didn't get merged correctly. New
changes are related to fixing gscan messages.

Change-Id: Ib4ddd26b83a736a1106d9784c57cfbab249101dc

Conflicts:
	service/lib/wifi_hal.cpp
6 files changed
tree: 22149e2dce0db147ec6ddfb66a33b9ef4cb8235e
  1. service/