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

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

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