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

Change-Id: I9c31dd6d6b9e523e63f09598179a8bf5b7ab21b9