Merge commit '2268d748b893f82330f1be50b09d699cb8e7f9d3' into HEAD

Change-Id: I00331c122f55594e36d3766504a2da5ca4aa4fed
tree: 6f34eaddaa647335f18b3b8b1e1bb20aa48385e3
  1. cld80211-lib/
  2. qcwcn/
  3. wcnss-service/
  4. Android.mk