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

Change-Id: I48dca82bc2f448f2174cf268b1fdc228dd2bf4ca