Swap aac encoders (again)

Swap aac encoder in attempt to fix aac timestamp issue in hls and ts (will also allow 5.1 aac when we put it back in)