tools: Fix clang-format values

According to the clang-format documentation some values in our
.clang-format are incorrect. See:

- https://clang.llvm.org/docs/ClangFormatStyleOptions.html#allowshortblocksonasingleline
- https://clang.llvm.org/docs/ClangFormatStyleOptions.html#sortincludes



Signed-off-by: Yuval Peress <peress@google.com>