Merge "ART: Refactor verifier callbacks" am: 34760f9a97
am: 6e0e9c77b0

* commit '6e0e9c77b0b6109605eef6e5ea2c2b3de30a6ffc':
  ART: Refactor verifier callbacks