roomservice: python3 support

Change-Id: I7621818ba7ed997676728fe865f37a25b3a5b8b5
Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_build into cm-10.1

Conflicts:
	tools/roomservice.py