[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 49aa3ba6cb  -s ours
am: 9b80412d39  -s ours

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