am bf2074ea: am b33b6502: Merge "Implement CFI for JNI."

* commit 'bf2074ea724d6e99340a190528c937e698a624bd':
  Implement CFI for JNI.