fix more Java1.5 incompatibility

Change-Id: I9d750f525fe73d59c150b322401418dfbd0822dd