Merge 668783414926fa2be6c18a11f56b7ea587a1e2f1 on remote branch

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