Merge 4e0f746e5222136ebb1cb16e1b81e55bdebf90e7 on remote branch

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