Merge "jni: Test that pushed handle scopes are popped after JNI transitions" am: 30267ea042
am: 15912e9d0c

Change-Id: Ib692e0f5b962cb3a14d1c6a0625288e84ef74510