This fixed issue #1695 for C++. The example
HelloWorld.cc and tests test_libbcc also got fixed.
Signed-off-by: Yonghong Song <yhs@fb.com>