Merge "Rename deps in libc to account for name/src collision work."