Revert^2 "Fix run-test check for --jvmti-redefine-stress" am: 92eba60f1f am: c18a483ac7

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

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