Merge "Fix non-deterministic errors with LOCAL_*_x86_64"