Remove part of guava uses

Change-Id: Ifb6e5b5bf391d540b3738b501c68221065a21a1b
11 files changed