Update aosp/master Clang for rebase to r275480 am: 4967a710c8
am: 18d05a9f91

Change-Id: If0a37116cbe2eec2dfa8c19dec44a0000c451d53