Merge "ART: Fix tidy warnings in veridex"
am: 0c5387a781

Change-Id: I5d3d245ee8db076acee70df72e5f3dfe8bead810