Merge "Make it possible to build strace for x86-64."