Merge "Emit better (correct) timestamps that respect AAC upsampling."