Merge "ART: Add support for generic class signature"