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

Change-Id: I5f72dc6124c838f59c0f82b7515061320e8ed8f4