Merge "Update to clang-4639204"