Fixing warnings/errors from c++ compiler.

Change-Id: Ia561dda53f2dd10e3a10a2df2adb8027ab19397a
5 files changed