Merge be97bb60f6238eaa0f339277a6e3a719c0aafdee on remote branch

Change-Id: I55a9853ecd5e1ac66e151c922f7230d34f0154c2
tree: 16e3f72b41f0ca546f27cb93e164c03e44391352
  1. cld80211-lib/
  2. qcwcn/
  3. wcnss-service/
  4. Android.mk