Merge 7b9f70b2f1aa9ebbdca0b571821eae85e69eba41 on remote branch

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