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

* commit '6ff730b67804ca4f5a4b2c67784e127f6e762e11':
  Move emulator tracing into its own file.