Merge 0b25157f0fe464de80f74225047d8e6b89cc3d0d on remote branch

Change-Id: I73f19d2387a5aa1d138a8fcdc19b40bfb1f36824
tree: 681f37f6e6807f579c2d8eb0bf7e0a89e2ca03b6
  1. cld80211-lib/
  2. qcwcn/
  3. wcnss-service/
  4. Android.mk