Merge "Replacing b_width_log2 with num_4x4_blocks_wide_lookup."