Merge "ART: Refactor jfieldID handling"