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

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