Merge "Revert "Fix ArtMethod::GetInvokeType for static methods on interfaces.""