Merge "Fix strace build after upstream sync."