Merge "Undo class_linker.cc workaround for out of registers bug."
am: f1d60334ec

Change-Id: I24309eb4a59535120cdc552ca0e4b1ef959b523e