am 6d24eef4: Merge "Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"" into jb-mr1-dev

* commit '6d24eef4b6443afa8d361437c0a3a575b69609ae':
  Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"