Merge "Revert "ART: Remove workaround in verifer after Jack update.""