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

Change-Id: I89d4f01737b77ec062aeaa29c476a344491a9c9d