skia names, fix clang-format