Squashed update to ol_R5.SP5.01

924fc97 WPS: Select only correct AP following provisioning (UPSTREAM)
96f59d8 hostapd: template function for auto-selection of channel (INTERNAL)
c5f4bec hostapd: re-use auto-select scan result for 40Mhz pre-scan (INTERNAL)
8c1b10e hostapd: auto-select AP channel (INTERNAL)
7d2c675 hostapd: auto-select secondary channel (INTERNAL)
586ba7c hostapd: add support for ACS whitelist and blacklist (INTERNAL)
5f65e16 wpa_s: new override_p2p_go_intent conf parameter (INTERNAL)
172d2b2 P2P: accept provision discovery with bcast group ID
7190ff7 P2P: wait on GO negotiation confirm

Original commits from:
https://github.com/TI-OpenLink/hostap/commits/ol_R5.SP5.01

PS2: removed:
0225e1b wpa_s/hostapd: add description to version string

Change-Id: I2d4fbaee04a0c8785e4c4b8a1333f4aff7204cc9
Merge "Squashed update to ol_R5.SP5.01" into cm-10.2
Merge branch 'cm-10.2' into martincz