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

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