Merge "Update strace to 4.20." am: 18120556c1 am: f174ca62c5
am: 10c524dc75

Change-Id: I9e0d6fcc6ce0e0df327c69423e8dff4bf99b48ac