am 54e0b7de: am 6b966aff: Merge "Fix sanitizer choice for global vs module."
am 54e0b7de: am 6b966aff: Merge "Fix sanitizer choice for global vs module."

* commit '54e0b7de2ba60b8c769b985be397317790dcfd75':
  Fix sanitizer choice for global vs module.

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