Merge "Revert^4 "JVMTI PopFrame support""
am: d55f6ee508

Change-Id: Ia3927d096a860ad4652591279770564d03eb726b