Draft: 40123: Allow building instrumented tests for variants other than debug

Closes #40123 (closed).

The okio dependency patch should not be needed for 84, so I'm not sure if it's worth to target 84 for this and drop that patch.