Merge "Multiple changes to ACodec/codec tools:"