DO NOT MERGE  Revert "Switch to guava15 in tf"

Guava15 doesn't exist yet in lmp-dev

This reverts commit 5ca32dea599eb15b16381a47c5b669dfaf655f18.

Bug: 13506843
Change-Id: I4d9f010cb41384352a4f823d7c413f39af06c24d
3 files changed