Merge "Modify ACodec to allow using Treble."