Merge "Fix x86_64 build"