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

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