am f1b7c073: am 6ed5bea4: Merge "Make use of sanitizers without clang an error."

* commit 'f1b7c073a4d1b3f47811b6b9e85c6589d293c373':
  Make use of sanitizers without clang an error.