Merge "ART: Fix class-linker handling" into lmp-dev