Merge "Change j.l.r.Field to use ArtField index instead of dexFileIndex"