Clean up some build warnings

Bug: n/a
Test: n/a
Change-Id: I062e42f14bd1cfafc4a145956fc08ce9c91b2be6
1 file changed