Merge "Switch to clang-4053586"