Fix x86 build (problems spotted by StrictMath tests).

Bug: 2931959

(Cherry-pick from master.)

Change-Id: I50bd01b2292ec40f140683e5ab368271afb74ec3
2 files changed