Merge "Format fixes in vp9_rd_pick_inter_mode_sb/sub8x8"