Demacro-ize block_builder_arm/block_builder_thumb