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

Change-Id: I2a4609663027f3ebda6d1894f43ad9dc444eecba