Merge "Fix the external/strace update-ioctls target."