Merge "Remove a few more references to vp9"