am 16e1eda5: Merge "x86_64: Fix issue in JNI compiler"

* commit '16e1eda5b1fcaf617371072692503714c7a6afe8':
  x86_64: Fix issue in JNI compiler