Fix build failure in Java 7/8 for the previous commit.