Merge "adb: avoid leaking pty master FDs." am: 47757e93aa am: e21440e547
am: 3fa4db3ee3

Change-Id: Ib992b3c058d9a173dee143e9bb8dc88fd3ee3f35