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