Minimal switch to C++ to make future cleanup easier.

Bug: N/A
Test: builds
Change-Id: Ia23db5a5e75749d11fa9797ee4469dd100a1ccaa
3 files changed