I'd say between CMU and Berkeley, Berkeley is by far the better choice for industry because of it's location. Silicon Valley is really ideal if you want to network in the industry because all the big companies have offices there.
That being said, I think a lot of your decision should be based on your specialization. For example, CMU has an excellent natural languages department, so even if I wanted to go to industry, I'd be hard pressed to let go of CMU.... (Although it looks like that scenario won't be happening for me. )