am f30fd014: Merge "Workaround for add_tid_to_cgroup failed to write" into jb-dev

* commit 'f30fd01497a53cbff8692721026c3f7b6830158e':
  Workaround for add_tid_to_cgroup failed to write