Merge "Temporary revert of new AAC codec to fix build"