Merge "Improve the documentation for syncing upstream strace."