am 1fbcc3ad: Merge "Added JNI hack to support JNI hack"

* commit '1fbcc3ad1344f6997f34db0ab8296b0867c84b71':
  Added JNI hack to support JNI hack