Convert files from C to C++ am: 7dab0e5791 am: 63930d078e am: 6f86d2c661 am: 5041697c6a
am: 51d33b2881

Change-Id: I3f824b3ebc743799321910cbe2a4d00be46f45a8