Temporary revert of new AAC codec to fix build

Change-Id: I5c7f0360883fc68e313d10b1aa5dac1463fae7fb
1 file changed