Update to Android ARMv6 stuff

Change-Id: I133f0cda127e077f7327358b29000b109a73d0b6

Conflicts:

	envsetup.sh
	tools/roomservice.py