Merge 496aef93e0dce69821dde6df099bca9f555b89ce on remote branch

Change-Id: Icbdc5c4f57e47ec142c052d4eb4ba64c019e6599
tree: d0ab9ae61ba12ac33fb30f01245b3f9f7673d042
  1. cld80211-lib/
  2. qcwcn/
  3. wcnss-service/
  4. Android.mk