[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: bc44bd9a13  -s ours am: b28f9e06fd  -s ours
am: 4d002081f2  -s ours

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