Merge "Revert "JVMTI PopFrame support""