Merge "Update strace to 4.20."
am: 18120556c1

Change-Id: I526a90c717696dd749a3aa2ff98c3fac524be854