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

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