Merge "ART: Add support for generic method signature." am: a4a903a567
am: a1f8090bed

Change-Id: I6630cd77c36de7b987cc021f6cc0dd9305ef9d12