misc build and wifi fixes

Change-Id: I6858c5380f057f11bf799d7f6d36a54404e8a768