Merge "Update JNI to work with latest stack drop." into jb-mr2-dev