am ec7d9dc7: Merge "Avoid zombies on androidscreencast"

* commit 'ec7d9dc713322bd41b1e348c0ea3b1304a13dba9':
  Avoid zombies on androidscreencast