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

* commit 'cf6e1ff62a0abbea186d5a62f23d0b71671202ca':
  Clean up sanitizer configuration.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build