Replace the use of num_4x4_log2 with the actual block size as the
condition to check if a block is partitionable. This avoids conflict
issues when multiple experiments are turned on.

Change-Id: I666d52458590a6f88c3995a140d20b0d66d27bfb