am 3a059d2d: am f35f66a8: Merge "Use new sanitizer option."

* commit '3a059d2d89dd87690ccf4081097d8d069bb7f3c4':
  Use new sanitizer option.