Merge commit 'ff71e5bb44242e6020bf40ed2c205143cfcadd42' into HEAD

Change-Id: Ie93f5c5c5dd517cec722df024e900a94ff7e2d22
tree: 46ee4fae906f62a8ea2a5bd1e07fdaa7d897a2df
  1. qcwcn/
  2. wcnss-service/
  3. Android.mk