remove separation of host–guest task roles

Bug: 960434
Change-Id: I5f0992df2dfc30baa1dbb43b477f3d71b324993f