am 683a387e: am 4ed95088: Merge "Add support for ubsan."

* commit '683a387efb079fefd3d2895875868b7c2a5a4a06':
  Add support for ubsan.