strace: Merge two similar patches

Both patches change the same paths to gawk, merge them together
as we only need one patch for this.

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