vendor_hack already includes cm_roomservice

Change-Id: I1d4fdc306e03f8b8a4f31d9dc12f47bd40757faf