Fixed up incorrect push
Fixed up incorrect push

Somehow I pushed the wrong patch of issue 6508007. This should patch
patch set 5 correctly.

TBR=sjg (build break)
TEST=chromite/buildbot/cbuildbot --buildnumber=3992 --buildroot=/b/cbuild --revisionfile=chromite/buildbot/revisions.pfq  x86-generic-pre-flight-queue

Check it gets past the init phase.

Change-Id: I3f3f83fec36271a36aa1295a129782861196c0c5

BUG=

Review URL: http://codereview.chromium.org/6673030

bpsinc-native/src_third_party_chromite,chadversary/chromiumos.chromite,bpsinc-native/src_third_party_chromite,zhang0137/chromite,bpsinc-native/src_third_party_chromite,zhang0137/chromite,zhang0137/chromite,coreos/chromite,chadversary/chromiumos.chromite,coreos/chromite,coreos/chromite