am 9c7703d3: am c006db38: Merge "Workaround for multi-line comment error when compiled with g++."
am 9c7703d3: am c006db38: Merge "Workaround for multi-line comment error when compiled with g++."

* commit '9c7703d3d000dd0bf331337dc86bfacb62de486b':
  Workaround for multi-line comment error when compiled with g++.

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