vboot2: apply CL 205988 to the autotest client

CL 205988 introduced bug 30387, which was fixed by CL 207233. Since autotest
server runs on ToT and the client runs on R37, this change applies the client
change in CL 205988 and CL 207233.

BUG=chrome-os-partner:30387
TEST=None. A quick fix for a broken branch.
BRANCH=release-R37-5978.B
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>

Change-Id: I52e80d4e76b4392af88902f1bc960fd662585863
Reviewed-on: https://chromium-review.googlesource.com/211532
Reviewed-by: Yusuf Mohsinally <mohsinally@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
1 file changed