am fae8ab11: Merge "Update aosp/master clang for rebase to r235153"

* commit 'fae8ab1182a88ed92223082e340157db9443343d':
  Update aosp/master clang for rebase to r235153