[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 77985e2b08 -s ours
am: 7a16e5d2d1 -s ours
am skip reason: change_id Id91aabbe6f7e721a807826d5f0661993e5dfe563 with SHA1 8e19a7a10a is in history

Change-Id: Ie887dd3102b685bdae767eb4c54a58f0afd9e12a
tree: 05ea21c9dd7d37c0e8c2f5bd4eaf97ace784b5c9
  1. hal/
  2. legacy/
  3. post_proc/
  4. visualizer/
  5. voice_processing/
  6. Android.mk
  7. OWNERS