tree 40d0e21286e13bba24b846e37b5fe2cc2d56e393
parent 0e7095f33ca74b6bc82d8ba89bc87e47a1eaca00
author Elliott Hughes <enh@google.com> 1296173363 -0800
committer Elliott Hughes <enh@google.com> 1296174714 -0800

Fix x86 build (problems spotted by StrictMath tests).

Bug: 2931959

(Cherry-pick from master.)

Change-Id: I50bd01b2292ec40f140683e5ab368271afb74ec3