Merge "Fix build for x86_64"