From: Treehugger Robot <treehugger-gerrit@google.com>
Date: Wed, 8 Feb 2017 20:28:23 +0000 (+0000)
Subject: Merge changes I1fb50fb6,I8b3fa817
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=390194398b566e92fdb35c980b50bfacfb23add6;p=android-x86%2Fart.git

Merge changes I1fb50fb6,I8b3fa817

* changes:
  Ensure that both stderr and stdout are captured
  Make sure that we join paths correctly.
---

390194398b566e92fdb35c980b50bfacfb23add6