Merge "Prevent clang-format from formatting Java imports"