Merge "Fix x86-64 target build."