am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow

* commit 'd5d23f6438cd77f18a93658b1bb67326d5f7c73b':
  DO NOT MERGE - audio effects: fix heap overflow