Reason for revert:
  The original x87 related codes of the CL #34627 (https://codereview.chromium.org/1748123003) had a mistake and caused the x87 debug build fail.
  Need to fix it and add it into the x87 port of the CL #34627

BUG=

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

Cr-Commit-Position: refs/heads/master@{#34679}