Merge 060f6b5f57fe1c89409a91da54d4307c7bd16503 on remote branch

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