[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 2f0ea63af9  -s ours
am: 9aefb2316e  -s ours

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