Tweaks for C++ compilation.

Change-Id: I6ac0ffe4941c6d655025a0738413b60b636400a9
1 file changed