Merge "ART: Add support for generic field signature"
am: 08d567b67f

Change-Id: I67e3f3ff23e86f6d6526f80e6481134a14d71c54