Merge "Use the alternate 32-bit base address for asan build only."
am: 6a669aac63

Change-Id: I54bdc502eb62c0d18526feabac0bf63fcb86629c