am ec64c0b6: am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"

* commit 'ec64c0b6e639b743398fb543218100fdaf9a7f69':
  Core/jni: Disallow relocation for decryption