Change-Id: Ib9a6373f98474f1242367b5285086251a9d580e5
This is the minimal change needed to switch it over to C++, which paves the way for using more robust utilities like std::string. Change-Id: I80ed6280146875eb6ddbbb340c05450388ca13f0