Merge b40824da98dc960b211f511fa78e413d0850b75e on remote branch

Change-Id: Ic159b03f1324a2863d21e23f4e8679d5f67b9491
tree: 573d0d0d5313f79af8d821a0a6e31d5de0e97d62
  1. cld80211-lib/
  2. qcwcn/
  3. wcnss-service/
  4. Android.mk