am b08d3a39: Merge change 2004 into donut

Merge commit 'b08d3a396914b1aaba1270a9021289bdbe3cac5f'

* commit 'b08d3a396914b1aaba1270a9021289bdbe3cac5f':
  Handle munmap() and add support for tracing JNI (native) calls.