am 211806ad: Merge "Use new sanitizer option."

* commit '211806ade546b5e3ca3cc320796fe9983ec5ea1e':
  Use new sanitizer option.