Merge "Do not save/restore regs in ClinitCheck slow path." am: 79ee7719b7
am: a3e462c687

Change-Id: I6f39124387cd4d838fdfbe764115e7164175cbf1