Fix x86 and x86_64 builds.

Change-Id: I1ee9117843aff2abe4067f288b8496d4bfc78c9e
2 files changed