Merge "Remove workaround in aac for broken toolchain"