Merge "ART: Refactor class-linker methods"