Merge "Update idegen for guava 27.1"
am: 236e021c47

Change-Id: I60131914783d8bd44ecc5362dc85ef3d70894d08