Shuffle build dependencies a bit to fix build

TBR=eseidel@chromium.org

Review URL: https://codereview.chromium.org/677483002