Shut up some compiler warnings on gcc

Change-Id: I8548aebd3c39797b253eef472bfe1c40f2f7ec59
3 files changed