am ec8df9af: Fix tests for Java 6.

* commit 'ec8df9af2f35eb5be4df01d66b1add4a4e7546c7':
  Fix tests for Java 6.