Merge "ART: Add support for generic class signature" am: 07af6d0c7b
am: c35ead0ac6

Change-Id: Ibaf0578be9612cc07b5fc630629c2ce23e69f094