Merge "Upgrade strace to 4.17." am: 06036bc5d9 am: 8ae7aaaa2b am: c68065f9c1
am: db7a40d48d

Change-Id: Ifaf625bd58335fe444bbac6807e5f2de42b1b31e