am b35f36f0: am 4f294558: Merge "Fix broken insert reverb auto tests." into gingerbread

Merge commit 'b35f36f08ddc59fb0e264aff9de4d465321b26ca'

* commit 'b35f36f08ddc59fb0e264aff9de4d465321b26ca':
  Fix broken insert reverb auto tests.