Merge commit 'd36d0b6a93d3b1c9df4b75f8a1139bf23b363139' into HEAD

Change-Id: Ic01572eddfd7bd43c9186adb388d1d073265703a
tree: 8fa615833aaee0d72d68bfdb197a2f3fa65750c6
  1. qcwcn/
  2. wcnss-service/
  3. Android.mk