Merge "ART: Add UNLIKELY in verifier" am: e9196b6332
am: ac0782a1ad

Change-Id: I0f080a4fe00e6292cedb1377910a43c764731ee3