Subzero: Rerun clang-format after LLVM 3.6 merge. BUG= none R=jvoung@chromium.org Review URL: https://codereview.chromium.org/974113002