Merge "Update strace to 4.23."