Fix strace build after upstream sync.

Change-Id: I9ac78d23979e45d26fb71ecb4a75f70947c32d1f
214 files changed