Merge "Update strace to 4.23." am: 22c82c4a01
am: 85c0c9e38f

Change-Id: I7f1c5a2a90e407ccd2450c68cb0188de2f9d9615