Backport: Work around a type inference change in javac

https://github.com/google/guava/commit/26342f6fe1f8b629a2ce1bdb3ef872f84a7e960a
Bug: 27723540

Change-Id: Ib96fcf358f6c795c96b08214be7269d41f23eb02
1 file changed