Merge "Run clang-format with netd's .clang-format file."