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

* commit '20de32b9b709634ceb67ee91f2ada7d3a4ae5f8e':
  Fix sanitizer choice for global vs module.

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