Merge "Revert^2 "ART: Remove workaround in verifer after Jack update."" am: 3c683150 am: 251675c1 am: 8aeee7db am: f4bf2830 Change-Id: Id16332f54fa9df447b361f3f806e6c94220f7442