Merge "Move CapturedStderr to test_util library" am: 0ca2fe4c43
am: 1d86d453ad

Change-Id: Id6d01fbc78c319ca0f19b5a44acdef70df2ad4e8