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

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

Change-Id: I4c80c4d35d81c3b1ab85691723ba7cbdc279179a