Merge "ART: Change test 121-modifiers to use smali" am: 166ef74c73 am: 26c54faaa3
am: cb413335fe

Change-Id: Id733f1ebddd0b297ca88772e5aaa03c051a75046