Merge "Update strace to 4.21." am: 5b3348ca5f
am: f467e88f6f

Change-Id: I2061474eda464ece890ae3728da44ffefb9cfb4b