am d82cc1de: Merge "Fixup JNI" into ics-mr0

* commit 'd82cc1de848a678fa4bcaefdbc763307f3df4a75':
  Fixup JNI