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

Change-Id: Ia1053bf000acc7f327497fc070f2eaa86af10cef