Merge "Update aosp/master Clang for rebase to r222490."