fix java7 warnings

RB=181765
R=si-dev,slim,cpettitt,sihde
A=cpettitt,slim