Merge \\"adb: fix fd double close, Subprocess lifetime issue.\\" am: b23e5729a8
am: 34c6ca01ff

Change-Id: I7f0287759f138096f810324e3e55031e9b92a042