Clean up using_clang_toolchain/Makefile a bit
Fix formatting with clang-format