Merge f4de1c2a1cffcf3dc6c2d605b82e1f733f27be5a on remote branch

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