Removes unused BLOCK_2X2, BLOCK_2X4 and BLOCK_4X2 from the
BLOCK_SIZE enum.

Change-Id: I964d99718026c51a1eaf30d4a1fc83cc52f94083