Merge "Fix class_def_idx increment for FastVerify"