Merge "Force_split on 16x16 blocks in variance partition."