Merge 7c36bb37c38126d8a0494014f16af9933ec96b5b on remote branch

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