am 07607526: am 63082eab: am b6874440: Merge "Add support for a partial ubsan build."

* commit '07607526b8701f471869aecbd89fe4ea1990251e':
  Add support for a partial ubsan build.