Merge changes I64a73ce8,I37b249e4

* changes:
  Copy in the jni exception logging macros from android_runtime
  Remove need to call into android_runtime