fix various compiler warnings

Change-Id: I3bf3b351535843bde9c0c1d955315615bb7c30b2
3 files changed