Merge "Support for @CovariantReturnType annotations."
am: 2a403e51bb

Change-Id: Ia462083007aac92a782bbf648cb363a9d4de9f47