strace: Update patches/tests with upstream fixes

Replace the sockopt disable patch with a fix from upstream

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ac921989)
Signed-off-by: Steve Sakoman <steve@sakoman.com>