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

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