Merge remote-tracking branch 'origin/caf/github-qca/master' into wlan-service.lnx.6.0

  437476e Avoid duplicate definitions from wifi_hal.h

Change-Id: Id1b3836b73051628c2711f29994422401af4f293
CRs-Fixed: 2894923