Fix tracing

Move back to 32 bit method IDs, add a bijective map for method IDs.

Also some cleanup.

Bug: 19264997
Change-Id: Icdd36591df53ff975d30b9000cfe67d3ae8c51d5
2 files changed