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

* commit '2db3734ec6e985fc0edbf66c235711037e28a3de':
  Fix benign overflows in ACodec