Merge "Fix false positive stack ASan errors on x86."