Merge "Revert "Revert "Ensure Proxy frames work with JVMTI stack frame functions"""
am: 621df2b868

Change-Id: I18b45b38edd3f0a5679f117705b82d7b469a89c7