Update aosp/master Clang for rebase to r222490.

Change-Id: Ic557ac55e97fbf6ee08771c7b7c3594777b0aefd
diff --git a/tools/c-arcmt-test/CMakeLists.txt b/tools/c-arcmt-test/CMakeLists.txt
index 9014ccc..8914607 100644
--- a/tools/c-arcmt-test/CMakeLists.txt
+++ b/tools/c-arcmt-test/CMakeLists.txt
@@ -2,9 +2,15 @@
   c-arcmt-test.c
   )
 
-target_link_libraries(c-arcmt-test
-  libclang
-  )
+if (LLVM_BUILD_STATIC)
+  target_link_libraries(c-arcmt-test
+    libclang_static
+    )
+else()
+  target_link_libraries(c-arcmt-test
+    libclang
+    )
+endif()
 
 set_target_properties(c-arcmt-test
   PROPERTIES