Merge "ART: Fix missing field type crasher"