Merge "Fix class_def_idx increment for FastVerify"
am: eb0526c20a

Change-Id: I7f712bcb57a7f22a867ed03350163c646bb860da