Merge "Remove redundant vp9_zero in choose_partitioning"