Using num_{4x4, 8x8}_blocks_{wide, high}_lookup instead. Change-Id: I66a7ab807fa57395253b2d0e636c2479fa8c4adf