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

Change-Id: Iaf5d0e67b5e8bb31ee225cdbec0cbcfed8a8dcd0