Merge "ART: Fix missing field type crasher"
am: 148a7c3e1f

Change-Id: I7f22da4ccecca496b7ebec86b0110fe9cffe423f