[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 2d4e92a7f5 am: fd259e4fce -s ours am: 2046695623

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