Merge "Upgrade strace to 4.17."