Merge change 1003 into donut

* changes:
  Add support for tracing Java method entry/exit in emulator.