Revert "Update roomservice dependencies for cm-12.0"

This reverts commit 4a8c2f4dc7e2150cc637c6a13fd8cb27e6224e61.

Change-Id: Ifd1fa4aa1499f9922d85cd09ce10f90395b5e902
Merge "Revert "Update roomservice dependencies for cm-12.0"" into cm-12.0