Partial revert of crrev.com/900553003, to unbreak arm64 build.
Partial revert of crrev.com/900553003, to unbreak arm64 build.

R=verwaest@chromium.org
BUG=454625
NOTREECHECKS=true

Review URL: https://codereview.chromium.org/892833003

Cr-Commit-Position: 972c6d2dc6dd5efdad1377c0d224e03eb8f276f7@{#26407}

UniversalFuture/moosh,UniversalFuture/moosh,UniversalFuture/moosh,UniversalFuture/moosh