Merge "Revert^2 "ART: Remove workaround in verifer after Jack update.""
am: 3c683150bc

Change-Id: I18946afbb446ff8b4a69c99dbb34920071ce2bfc