Merge "Revert "Revert^2 "JVMTI PopFrame support"""
am: 4ca6cc7ddc

Change-Id: I89391bfe1ca50db087eb1da37faa17b6fe45ada1