[automerger skipped] Merge Coral/Flame into AOSP master
am: 2dd444c395 -s ours
am skip reason: change_id I911b1a53ec46f39cc7597c2a31f59669db4f0699 with SHA1 e66c67c549 is in history

Change-Id: Ic771df24fbdef9c4aefbdfc5993b4b0ca9f499b7
tree: 09a382c89d58ac170687b86f24f3ebc3f80698b6
  1. cld80211-lib/
  2. qcwcn/
  3. Android.mk
  4. OWNERS