Merge "Renaming BLOCK_SIZE_TYPE to BLOCK_SIZE in the common/decoder."