am 40d559c9: Merge "Use new sanitizer option."

* commit '40d559c9af97439ffc2a659a85bbc23218371d92':
  Use new sanitizer option.