Merge b6ff0e3ccd7ca3b7929f8e4fd156e15aa9ba8701 on remote branch

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