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

* commit '3bc25d69580b5cdedd834fe6accf9cc27c0fb102':
  Add support for ubsan.