Merge "Implement CFI for JNI."