Merge "vp8_pick_inter_mode code cleanup"