Merge 1960921c330ce6b1a0ffdda3d47f377e0e9d1baa on remote branch

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