Merge "Fix 64-bit build DCHECK failure in mir_fieldinfo.cc ."