Merge "Update strace to 4.25."
am: 71ba2a0036

Change-Id: If070a38e9c6e33446f089f63738ea705112df53d