Merge 85f79a60c6e6429f9ee6550d2894e050dc052c2d on remote branch

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