Reconcile with klp-release - do not merge

Change-Id: I8065fe87949562cb2ec90f4e0126730cded42484
am 7864d326: (-s ours) Reconcile with klp-release - do not merge

* commit '7864d32668d1977771f371d2990b17a3d2c02b01':
  bcmdhd: Update bcm43241 firmware to verison 6.10.197.41.5
  bcm4339: update firmware to version 6.37.32.2
am 72b7f605: bcm4339: update firmware to version 6.37.32.7

* commit '72b7f605a62ad3da896ce87ef35547de4cfdd33f':
  bcm4339: update firmware to version 6.37.32.7
am 2c0566f9: am 72b7f605: bcm4339: update firmware to version 6.37.32.7

* commit '2c0566f9b9484c72205c385e8d1cc1aa25594129':
  bcm4339: update firmware to version 6.37.32.7
am ef8e2e57: bcmdhd: wpa_supplicant_lib: Allow buffer return for wls_batching commands

* commit 'ef8e2e571ffc2141a05c0087523e674b92ac2ea8':
  bcmdhd: wpa_supplicant_lib: Allow buffer return for wls_batching commands
am cf1f3ad5: am ef8e2e57: bcmdhd: wpa_supplicant_lib: Allow buffer return for wls_batching commands

* commit 'cf1f3ad5f22b80f2ede0b04060a2a397c7a44c9b':
  bcmdhd: wpa_supplicant_lib: Allow buffer return for wls_batching commands
am 0723657e: bcm4339: update firmware to version 6.37.32.7.1

* commit '0723657ed183a487befc20b0d48e5ce8e332a43d':
  bcm4339: update firmware to version 6.37.32.7.1
am 0bfd5156: am 0723657e: bcm4339: update firmware to version 6.37.32.7.1

* commit '0bfd51561daac35a3f70128d24ff180896a7e286':
  bcm4339: update firmware to version 6.37.32.7.1
am e2cafeaa: bcmdhd: config: Add separate p2p config overlay

* commit 'e2cafeaa55f552a21f0390a7bd88dd032695ee72':
  bcmdhd: config: Add separate p2p config overlay
am 54b4ead4: bcm4339: update firmware to version 6.37.32.7.2

* commit '54b4ead43e58b3b06a438d1297b86d929335bf3e':
  bcm4339: update firmware to version 6.37.32.7.2
am 182d81a0: am e2cafeaa: bcmdhd: config: Add separate p2p config overlay

* commit '182d81a0c4d2c64bbcffa193b07d76451ab57b02':
  bcmdhd: config: Add separate p2p config overlay
am f077a151: am 54b4ead4: bcm4339: update firmware to version 6.37.32.7.2

* commit 'f077a151e3223f46ea6189f4b05a73086cc889b0':
  bcm4339: update firmware to version 6.37.32.7.2
am f9cbf510: bcmdhd: Disable p2p capabilities for wlan0 interface

* commit 'f9cbf510b90774b4c1e083684a46dd7fb59d318b':
  bcmdhd: Disable p2p capabilities for wlan0 interface
am a218ba1c: am f9cbf510: bcmdhd: Disable p2p capabilities for wlan0 interface

* commit 'a218ba1c886a230d2943bc0f3b4bf05a38159b18':
  bcmdhd: Disable p2p capabilities for wlan0 interface
am 6806d7ab: bcmdhd: Update bcm43241 firmware to verison 6.10.197.41.6

* commit '6806d7ab09669d85e20a9cc2ef4be5e59b1fe0e5':
  bcmdhd: Update bcm43241 firmware to verison 6.10.197.41.6
am e8fd9f20: am 6806d7ab: bcmdhd: Update bcm43241 firmware to verison 6.10.197.41.6

* commit 'e8fd9f203e54ae7920cf24fa2f1b3619afbbb0a3':
  bcmdhd: Update bcm43241 firmware to verison 6.10.197.41.6
am 4878960c: bcm4339: update firmware to version 6.37.23.34.1

* commit '4878960c6a6e0f53f018441dbbfd9fc0c441ce44':
  bcm4339: update firmware to version 6.37.23.34.1
am d26b86c5: am 4878960c: bcm4339: update firmware to version 6.37.23.34.1

* commit 'd26b86c58bafb5ad12a7e277e8d1dd615f66bf8c':
  bcm4339: update firmware to version 6.37.23.34.1
am 358a24ca: Add Batch-scan capable firmware

* commit '358a24ca20e90dc1e4c3df3a76f71dabd3400d5c':
  Add Batch-scan capable firmware
am 27fcaf03: am 358a24ca: Add Batch-scan capable firmware

* commit '27fcaf03f6a1a3ed2bb86f2f213e06323fe680e5':
  Add Batch-scan capable firmware