Move up from Guava 15 to Guava 21

Bug: 517457
Change-Id: I7da9f4d6ac57ededca11bceedc5d07cd6ac6bff4
Signed-off-by: Marcel Bruch <marcel.bruch@codetrails.com>
14 files changed