Merge 25678dff565210aea063e1690dbb3074f3a3df0a on remote branch

Change-Id: I1250c06052759f48da57dfa6c6b1bde81ffcfe82
tree: 5ba55d1d3033398e0a15cd9b62b7cb19f83885c0
  1. cld80211-lib/
  2. qcwcn/
  3. wcnss-service/
  4. Android.mk