am fad70977: am cf6e1ff6: am 27176208: Merge "Clean up sanitizer configuration."

* commit 'fad709772e766ce83b4667e89a25a7f0d90ca5f8':
  Clean up sanitizer configuration.