am 1403aa36: Merge "Move emulator tracing into its own file."

* commit '1403aa36b2d9d0c295402a935bb07ea661536fcb':
  Move emulator tracing into its own file.