Merge "Revert "Ensure Proxy frames work with JVMTI stack frame functions""