Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 4ff40ccbfd  -s ours am: 690dbecf8a
am: f04cb090da  -s ours

Change-Id: I739aa6ff31ad0412b839b6ed5521a815ad19cf06
tree: fd146afd973bb5cb42e338cfd48db691e4092c87
  1. hal/
  2. legacy/
  3. post_proc/
  4. visualizer/
  5. voice_processing/
  6. Android.mk