Merge change 3386

* changes:
  Move call to compiler from jni to core library code.