Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master
tree: 28cf770d2f74068e09bd5bbe812d22295e672a85
  1. cld80211-lib/
  2. qcwcn/
  3. Android.mk
  4. METADATA
  5. OWNERS