Workaround javac generics bug Some versions of javac (including jdk1.6.0_24 used on ci.jenkins-ci.org) have issues inferring generic type parameters. Specifying them explicitly works around the issue, and fix the build on ci.jenkins-ci.org). Change-Id: I59968a076c600f64653502981cb3a1ee725bb81d