am 60a40d9e: Merge "Update aosp/master Clang for rebase to r222490."

* commit '60a40d9ee5c5ce10df829184a6a14694f2ef8fb8':
  Update aosp/master Clang for rebase to r222490.