Convert files from C to C++
am: 7dab0e5791

Change-Id: I1c06696dc125a9776ecc263b609fba503c502c66