Merge "Update aosp/master clang for rebase to r235153"