[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 136eb4d05f  -s ours

Change-Id: I4b922947892aad51577abad276c07e408d0a98d6
tree: 856038febf4f9efc4a2f61956587833c01dd48f3
  1. cld80211-lib/
  2. qcwcn/
  3. Android.mk
  4. OWNERS