[automerger skipped] Prepare tests for dexpreopt changes. am: c67528bf -s...

[automerger skipped] Prepare tests for dexpreopt changes. am: c67528bf -s ours am: 1b295ebb -s ours

am skip reason: Merged-In Ib957765b9287d51c082e0a33cee17a6bb56daeef with SHA-1 b95998be is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23206714



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