[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: c06ce6632e am: b62cacc43c -s ours am: 04b18e6f14

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