Merge changes Ie12773da,I4d390730,Id38ca6fc

* changes:
  WiFiHAL: Add MAX_NUM_BLACKLISTED_BSSID attribute to gscan capabilities
  WiFiHAL: Sync with wpa_supplicant src/common/qca-vendor.h
  WiFIHAL: Remove qca-vendor.h inclusion from nancommand.h
tree: e0b23a68353025b99f26bfa061ec0c0cfa5627e2
  1. qcwcn/
  2. Android.mk