Merge "Don\'t send screen unless we\'re talking to a new adbd." am: 9f90368701 am: 5e3589da14
am: 7a2f48eb01

* commit '7a2f48eb01a64886fdf0064041daafe29a07289e':
  Don't send $TERM unless we're talking to a new adbd.