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

Change-Id: I5f37ef287ed174d587e2360857dc6ce349859788