Merge "JVMTI PopFrame support"
am: dd0f77c400

Change-Id: I7dedae73fca6456818c4522b61363717c03fcc4e