Not going to format the whole world just yet, but this helps for `git clang-format`. Change-Id: I482819419647e4c752d3b044bde8d637e1fae1e5