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

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