Get code to compile in C++.

Change-Id: I2f56e6b71e33ffecdba9e4fa9ef8f891c88f850f
2 files changed