Remove BLOCK_2X2, BLOCK_2X4, BLOCK_4X2, which has been removed
from codebase.

Change-Id: I1c4ac7d148b7e95b1b104df7b9664cbb31928ddc