Merge "Fix false positive stack ASan errors on x86."
am: 71d763a5c4

Change-Id: I7c3006cf07343587613ec7f6580ba90987ca84f4