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

Change-Id: I5339f27aa24583c3740b68a8ece38b5f4d23d6fc