Track changes from clang r212387, r212388

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@212390 91177308-0d34-0410-b5e6-96231b3b80d8