Merge "Adjust expectations now that we take vdex-only files." am: 86b30e3fab am: 72b0856605

Original change: https://android-review.googlesource.com/c/platform/cts/+/1677237

Change-Id: I62d5546d3f1627141a069895365b2a2463ce01d8