Merge "ART: Fix class-linker handling"