am 721e6a45: Merge "Use new sanitizer option."

* commit '721e6a455f2100138009dee0d8592ecbc4bedbac':
  Use new sanitizer option.