Merge "Revert^4 "JVMTI PopFrame support""