am 27176208: Merge "Clean up sanitizer configuration."

* commit '2717620873fa1936779662a96de05033b89ddb19':
  Clean up sanitizer configuration.