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

Change-Id: I4666599077eede4e59b429bfd75159928c63c3a5