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

Change-Id: Icdb861eb2b047048d9434dee3d58d16ec5bd1a23