Merge "TypeVariable: tweak Android-removed marker."