am 78ceeb4f: am 2fd08e2d: Merge "Fix compilation errors when setting kTracing = true."
am 78ceeb4f: am 2fd08e2d: Merge "Fix compilation errors when setting kTracing = true."

* commit '78ceeb4f912399f8579366d1ba6564ae9c1a506d':
  Fix compilation errors when setting kTracing = true.

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst