Merge changes from topic 'wifi-aosp-master' into stage-aosp-master

* changes:
  Do not define superfluous wpa_supplicant service
  Label Broadcom's firmware reload path as such
  Add wificond to flounder image