x64-upstream: Fix unit test failures of sandbox