am 02565fec: merge from open-source master

Merge commit '02565fec8240bbff105f285e9e25aade52c15450'

* commit '02565fec8240bbff105f285e9e25aade52c15450':
  Fix ADB daemon file descriptor leak