Merge "Cleaning up vp9_init_second_pass()."