Merge "Change j.l.r.Field to use ArtField index instead of dexFileIndex" am: 648e017f1d

Change-Id: Ib1150f85fc26627fe6b1b0f1f1ede14e4968db17