Merge "Revert^2 "ART: Fix MethodHandle invoke-super"" into pi-dev
am: 5665c97b42

Change-Id: I4c339c93b1731db514e4fcf92ae227d941632f67