am b260872e: Merge change 2024 into donut

Merge commit 'b260872ea4ab52286e1abfa4e79d12feb3d46253'

* commit 'b260872ea4ab52286e1abfa4e79d12feb3d46253':
  Add support for native (JNI) calls to the trace tools.