Merge "Remove useless code in aacenc"