Switch keystore to binder

Change-Id: Idfcff5f2799863075160cc6c2565f2fe774c2552
Fix INCLUDES path for keystore headers.

Fix the following build error for master:
external/wpa_supplicant_8/hostapd/src/crypto/tls_openssl.c:49:35: fatal error: keystore/keystore_get.h: No such file or directory

Change-Id: I81c64677040287438e467f887c2f1c63a3239350
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Merge branch 'cm-10.2' into martincz
Fix aliasing error in driver_nl80211

Allows strict aliasing with GCC 4.8 cpp 11 -o3

Change-Id: I7595646d10298c4e27d9fe71007a6b499256be0d
Merge branch 'cm-10.2' into martincz
wpa_supplicant: Add 'SCAN TYPE=ONLY' functionality

Usual manual scan request may cause reassociation due to several reasons.
New command is intended to perform pure scan.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

Change-Id: I67d06265fc99ffee802d509410de5c8431c8c43a
Merge branch 'cm-10.2' into martincz
Fix build warning about annotated tags.

Currently, this error is issued 4 times at the start of a build:

fatal: No annotated tags can describe '0eb25c2a5e7441037265...
However, there were unannotated tags: try --tags.

This patch eliminates this non-lethal fatal error by adding --tags
to the git describe commands in the make files. This tag label is used
to set a CFLAGS version string for the driver.

Or, you can eliminate the error by putting in an annotated tag eg.:
git tag -a cm-10.2 -m 'eliminate error messages'
then, you don't need this patch. Or an annotated tag could be added to
the repo.

Change-Id: I388aff76df9d2e9b48da3693c89535133e7b1a35
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 branch 'cm-10.2' into martincz
Merge "Squashed update to ol_R5.SP5.01" into cm-10.2
Merge branch 'cm-10.2' into martincz