Merge "Move CapturedStderr to test_util library"