Revert "Update roomservice dependencies for cm-12.0"

This reverts commit 24db7b4a0fafc1b6478fa53b360b7c1867ed38a4.

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