am 316f5b04: merge from open-source master

Merge commit '316f5b04544237eaba6dd8604463c1e3cb67ab48'

* commit '316f5b04544237eaba6dd8604463c1e3cb67ab48':
  Fix ADB daemon file descriptor leak