Merge 4889002ea0bec0c65e50ded9e5b1a7b97b56a421 on remote branch

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