Merge "art: Fix classlinker and nopatchoat test for PIC case"