Merge "ART: Clean up ClassLinker"