am 3296cb3a: Merge "Use new sanitizer option."

* commit '3296cb3a71172fee0b1fed5ae13610cbea0b0a9b':
  Use new sanitizer option.