Update for modified CapturedStderr.

Also fix off by one error exposed by changing the test.

Test: Built and ran unit tests.
Change-Id: Id983b8301fe33c21bfe1db1e67ef00681f852557
2 files changed