Fix clang warnings

Bug: 21695880
Change-Id: I2985a42a52ab27c546b4317ea70f94d1506c5347
1 file changed