Merge \"Merge \\\"Redirect bugreport stderr to host\\\'s stderr.\\\" into nyc-dev am: 6d349051ce am: e1d64b4eaf\" into nyc-mr1-dev-plus-aosp
am: aea076a5a6

Change-Id: I1a4c956a2b0d059b32eed0cfe37269ed6e04186b