Work around a type inference change in javac

Newer versions of javac have changes to type inference, fix to enable error
prone compile this module.

Bug: 27723540
Change-Id: I18518a8aa93bec8869e86b7b321048167a925514
1 file changed