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

* commit '24f31baef279797d6f9c2957ab5441a20506c4a1':
  x86_64: Fix issue in JNI compiler