Merge "Fixes x86 build."