Merge "Enable x86_64 build"