CDK-157. Compilation failing with Java 7 and -Werror.