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

Change-Id: I55de938d9e5f6b17e7f8dbbf99bab41fd5cecc72
tree: 5119669d9b35915a944ef7c1252e853f785c29b0
  1. hal/
  2. legacy/
  3. post_proc/
  4. visualizer/
  5. voice_processing/
  6. Android.mk