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

Change-Id: I35391d29989da0b8769e780abb4668b6c0ab19d6