Merge "Fix class_def_idx increment for FastVerify" am: eb0526c20a
am: c7c68eed9c

Change-Id: Ib1d6caf3d5c4c1baefc1063b08181fd71a10f005