Merge "Update strace to 4.18." am: 222ec16d60 am: c130cbdaa4 am: 66de2cdf7f
am: a237a880b3

Change-Id: If0c97da24b16be210df5a56294d1cf1a4f9c9639