Merge 3f34abe15828ead641c87aad6e5ae8068a72b434 on remote branch

Change-Id: I917169a010093ad9d3ad50bf1040bb1062667819
tree: 8456fcb67114a9cf8f4b64996c61a70700847169
  1. cld80211-lib/
  2. qcwcn/
  3. wcnss-service/
  4. Android.mk