Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp am: 3b76c25cee  -s ours
am: 268be8edde

Change-Id: Idd556e4ec777eb2ec4c52c6df28f16a64435ca9c