Merge "Revert "Ensure Proxy frames work with JVMTI stack frame functions""
am: 432d91004b

Change-Id: I2ececd1ac0b6e273a954efb031153a4fdd0e021d