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

Change-Id: I595091cf23b0eafc4f39c3d111c855e1bba1ac31