Make some dependencies more flexible.

BUG=none
TEST=trybot

Review URL: https://webrtc-codereview.appspot.com/728005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2583 4adac7df-926f-26a2-2b94-8c16560cd09d
3 files changed