Fix compilation with jdk8
Fix compilation with jdk8

Signed-off-by: Chet Kener <4bada73e411a9c678a318a79d04d7df4a5fc4429@gmail.com>

Conflicts:
	guava/src/com/google/common/base/Splitter.java

Change-Id: Ifa2f67f0b1a42daf70bf125784ad4c1b5eeb3ddc
Signed-off-by: Chet Kener <4bada73e411a9c678a318a79d04d7df4a5fc4429@gmail.com>

UBERMALLOW/external_guava,UBERMALLOW/external_guava