Fix two brainos in veridex. am: e92bc531dc am: 058f83c3f1 am: cac3a729c4

Original change: https://android-review.googlesource.com/c/platform/art/+/2388216

Change-Id: I135cd125d5cde257e3a999b8f43fd50a806efd06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>