Merge "ART: Clean up ClassLinker"
am: 0480523e01

Change-Id: I30752bcdd1d48e3f9a0cc031b2c74255f4973bca