Revert "Cleanup jvmti tests"

Breaks ndebug.

This reverts commit ca5b9dccced35a2dbf9626d92d3a44886aee097b.

Change-Id: I1f45fa43f554e9796f397b2f9f111689c3845692
17 files changed