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

* commit '2fd08e2d497261521ad94b3162eeed1a3ef51e13':
  Fix compilation errors when setting kTracing = true.

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