Fix checkbuild.

Bug: 170697222
Merged-In: I1a854f0d6be46cfd11ada58fa54589147e0f37d7
Change-Id: I2a7aa5f17b334545f79a4552be9f8df2f91f7b82
17 files changed