Merge "ART: Change test 121-modifiers to use smali"