am d4725517: am e05a1d4b: Merge "Avoid zombies on androidscreencast"

* commit 'd47255175ede1af31aee9132914e5d14549ba577':
  Avoid zombies on androidscreencast