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

* commit '41fea144eb9ea4b0f18ff047f68c9b24fdd5241f':
  Implement CFI for JNI.