Fix the strace build after the sync to ToT.

Change-Id: Ib59a12f38595c968445ebdf20c62081cf05e8d0a
32 files changed