Merge "Rename protoc to aprotoc."