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

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