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

Change-Id: If585680391d517df8696a55eccb9af499cf77a0d