[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: ceb72da643 -s ours
am: c7cf85b69a -s ours
am skip reason: subject contains skip directive

Change-Id: Id3a057b97aca52b4c6f0395940e68d0fb1d91771
tree: 1e46e24e7e6126566a2dfa923b7cfc8d698f0f88
  1. hal/
  2. legacy/
  3. post_proc/
  4. visualizer/
  5. voice_processing/
  6. Android.mk
  7. OWNERS