Merge "Correct comments that refer to VP9."