Merge "Use guava 21.0"
am: edb2e0c722

Change-Id: Icf8873b268677a631659a7ee0f7816495f6acd38