Merge "ART: Refactor jfieldID handling"
am: 89269b6f6a

Change-Id: I3896b3ed006122bd18846997b8e593e316e31a39