Merge change 2004 into donut

* changes:
  Handle munmap() and add support for tracing JNI (native) calls.