Merge master@5433138 into git_qt-dev-plus-aosp.

Change-Id: I0749829bf3a1273ec7049f0ca4b242cb6b575c1f
BUG: 129345239
tree: d05d48c6969e86a7aa8459990b9ff4ff806f41bd
  1. cld80211-lib/
  2. qcwcn/
  3. Android.mk
  4. OWNERS