am b33b6502: Merge "Implement CFI for JNI."

* commit 'b33b6502523d67180ce7e8044714d1e85dcabfa9':
  Implement CFI for JNI.