Fix build warnings

Bug: 27074067
Change-Id: I4562dd0832f578330f492ca49f6a8c59c8298933
2 files changed