Merge "Don't use ACC_SUPER to select invoke-super" am: c2e5927def
am: 3093e93bc6

Change-Id: I2a057b2a943d5ea5ccd5bf7d962af0ebf8015a87