am b88cc8dc: am 2db3734e: Merge "Fix benign overflows in ACodec"

* commit 'b88cc8dc252965c76472e91cb81dbe94fb4f64d0':
  Fix benign overflows in ACodec