DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master

Bug: 151763422
Change-Id: I755fa693619435cf19c7d6ebce862404e4d9c1ff
tree: 47786b9695c545d6d83d4a148cd1bdbbee6ac278
  1. cld80211-lib/
  2. qcwcn/
  3. Android.mk
  4. OWNERS