Patches
Merge branch 'kitkat' of https://github.com/CRXTeam/android_build into kitkat

Conflicts:
	tools/roomservice.py

	modified:   tools/roomservice.py