Merge "ACodec is a little more aggressive in its error checking now."