[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 2f0ea63af9  -s ours

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