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

Change-Id: I41ee9b60e5aeda9f4f06c61513f5cf4ddd70d5d5