Merge 97ac07f295b51369daac3154bffa436d443387c8 on remote branch

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