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

* commit 'c6c2885185ac02e58fdefac4e38fb5f8a6d194f3':
  Use new sanitizer option.