Merge "Replace guava 20.0 prebuilts with 21.0" am: 85bf1819a7
am: 10520b4594

Change-Id: Icff017c541432ab389e6b484cd98e2d97eae4a6c