Merge "Fix x86-64 strace build."