Merge "Fix strace build post-update."