Merge 8dbca1ae84793b8a39adec1fe652963b69ea52a1 on remote branch

Change-Id: I857e2eeb853747d84c85156d057c3bcb5dcebb84
tree: 5a1a41bd6463f493fba94c552d1357d4cd830ebb
  1. cld80211-lib/
  2. qcwcn/
  3. wcnss-service/
  4. Android.mk