Merge \\\"Redirect subprocess stderr to stdout in verbose mode.\\\" am: 1318ec93e7 am: 74d7b31f7d
am: dbae67fac8

Change-Id: I6a690861e22041a67bb5b17aff474ee8f0e8aa41