Merge "Ensure Proxy frames work with JVMTI stack frame functions"
am: a1a66f03f9

Change-Id: Iddf3a360bdb400d2feb70d9bca65f220b2bd59cd