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

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