Proper fixup of carbon.dependencies

Change-Id: I989357b4bfa91e70091356db6d1ef0aec1e8e3fb