[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 063abacf40  -s ours
am: 9fea8775e1  -s ours

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