Android U Beta 1 GPL
Merge "Fix AnnotatedTypeImpl#underlyingType to return the underlying type without annotations, instead of returning the same annotated type again"