Revert "Fix 64-bit host build."

This reverts commit f43287f3198fd41357a55a0efcb27cefc658b508.

Change-Id: I4469aaa28abf7312369211ceeb673925eecc31c5
2 files changed