[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 1966a96a62  -s ours
am: 9c5d9441f6  -s ours

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