Merge 97de033d01e28da57ccf94b9285c9e5147bc23d1 on remote branch

Change-Id: I5d22bcdef471d5414e107b883ce05d8c88e4b13f
tree: 96f435f04afef2a8e7dbc0402421dc24377af70e
  1. cld80211-lib/
  2. qcwcn/
  3. wcnss-service/
  4. Android.mk