Merge 9ebf56199fc4ea2d76bfaefa81ae20e33c134a63 on remote branch

Change-Id: I0a960f75e5fb5c8de455a96f1c55b18a84de319e
tree: 858324b1ea6524f4da854ea7a97aadc10349e194
  1. cld80211-lib/
  2. qcwcn/
  3. wcnss-service/
  4. Android.mk