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

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