Merge "run-as: Use 2-space clang-format."