Merge "Fix AAC encoder test util and remove files that are not needed"