Removed Java 5 dependency.

Change-Id: I6b460b4a6af00c8784c3976db29437b8617d8a79