Merge "Rename .c files compiled as c++ to .cpp" am: a7651f955f
am: 2d7a2a72dc

Change-Id: I5bf04900b0b60c6a34d7abeee0e05c4e3dee5ce6