diff --git a/CI Command b/CI Command
 # Kill and local adb
 adb kill-server

 # Forward adb port
 ssh -f user@example.com -L 5037:localhost:5037 -N

 # Make sure remote adb server is running, and wait for it to start
 ssh user@example.com "adb start-server"

 # List the devices, just for fun!
 adb devices

 # Uninstall your app
 adb devices | tail -n +2 | awk '{print $1}' | xargs -I {} adb -s {} uninstall com.example.app

 # Run the tests, but still exit with success so jenkins carries on
 ./gradlew connectedAndroidTest lintDebug | true

 # Grab the exit code of the tests, so we can fail the build later if we need to 
 export MY_EXIT=${PIPESTATUS[0]}

 # Close the ssh tunnel
 ps aux | grep "ssh -f" | grep "5037:" | awk '{print $2}' | xargs kill

 # Fail the build, if the tests failed
 (exit $MY_EXIT)
diff --git a/Makefile b/Makefile
 # Taken from this lovely post http://forum.xda-developers.com/showpost.php?p=55619695&postcount=70
 SRCS+= adb.c
 SRCS+= adb_client.c
 SRCS+= commandline.c
 SRCS+= console.c
 SRCS+= file_sync_client.c
 SRCS+= fdevent.c
 SRCS+= get_my_path_linux.c
 SRCS+= services.c
 SRCS+= sockets.c
 SRCS+= transport.c
 SRCS+= transport_local.c
 SRCS+= transport_usb.c
 SRCS+= usb_linux.c
 SRCS+= usb_vendors.c
 SRCS+= adb_auth_host.c

 VPATH+= ../libcutils
 SRCS+= socket_inaddr_any_server.c
 SRCS+= socket_local_client.c
 SRCS+= socket_local_server.c
 SRCS+= socket_loopback_client.c
 SRCS+= socket_loopback_server.c
 SRCS+= socket_network_client.c
 SRCS+= load_file.c

 VPATH+= ../libzipfile
 SRCS+= centraldir.c
 SRCS+= zipfile.c

 VPATH+= ../../../external/zlib/src
 SRCS+= adler32.c
 SRCS+= compress.c
 SRCS+= crc32.c
 SRCS+= deflate.c
 SRCS+= infback.c
 SRCS+= inffast.c
 SRCS+= inflate.c
 SRCS+= inftrees.c
 SRCS+= trees.c
 SRCS+= uncompr.c
 SRCS+= zutil.c

 CPPFLAGS+= -DADB_HOST=1
 CPPFLAGS+= -DHAVE_FORKEXEC=1
 CPPFLAGS+= -DHAVE_SYMLINKS
 CPPFLAGS+= -DHAVE_TERMIO_H
 CPPFLAGS+= -DHAVE_OFF64_T
 CPPFLAGS+= -D_GNU_SOURCE
 CPPFLAGS+= -D_XOPEN_SOURCE
 CPPFLAGS+= -DWORKAROUND_BUG6558362
 CPPFLAGS+= -I.
 CPPFLAGS+= -I../include
 CPPFLAGS+= -I../../../external/zlib

 CFLAGS+= -O2 -g -Wall -Wno-unused-parameter
 #LDFLAGS= -static
 LIBS= -lrt -lpthread -lcrypto -lssl

 TOOLCHAIN= 
 CC= $(TOOLCHAIN)gcc
 LD= $(TOOLCHAIN)gcc

 OBJS= $(SRCS:.c=.o)

 all: adb

 adb: $(OBJS)
 $(LD) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)

 clean:
 rm -rf $(OBJS)
	# Kill and local adb
	adb kill-server

	# Forward adb port
	ssh -f user@example.com -L 5037:localhost:5037 -N

	# Make sure remote adb server is running, and wait for it to start
	ssh user@example.com "adb start-server"

	# List the devices, just for fun!
	adb devices

	# Uninstall your app
	adb devices \| tail -n +2 \| awk '{print $1}' \| xargs -I {} adb -s {} uninstall com.example.app

	# Run the tests, but still exit with success so jenkins carries on
	./gradlew connectedAndroidTest lintDebug \| true

	# Grab the exit code of the tests, so we can fail the build later if we need to
	export MY_EXIT=${PIPESTATUS[0]}

	# Close the ssh tunnel
	ps aux \| grep "ssh -f" \| grep "5037:" \| awk '{print $2}' \| xargs kill

	# Fail the build, if the tests failed
	(exit $MY_EXIT)
	# Taken from this lovely post http://forum.xda-developers.com/showpost.php?p=55619695&postcount=70
	SRCS+= adb.c
	SRCS+= adb_client.c
	SRCS+= commandline.c
	SRCS+= console.c
	SRCS+= file_sync_client.c
	SRCS+= fdevent.c
	SRCS+= get_my_path_linux.c
	SRCS+= services.c
	SRCS+= sockets.c
	SRCS+= transport.c
	SRCS+= transport_local.c
	SRCS+= transport_usb.c
	SRCS+= usb_linux.c
	SRCS+= usb_vendors.c
	SRCS+= adb_auth_host.c

	VPATH+= ../libcutils
	SRCS+= socket_inaddr_any_server.c
	SRCS+= socket_local_client.c
	SRCS+= socket_local_server.c
	SRCS+= socket_loopback_client.c
	SRCS+= socket_loopback_server.c
	SRCS+= socket_network_client.c
	SRCS+= load_file.c

	VPATH+= ../libzipfile
	SRCS+= centraldir.c
	SRCS+= zipfile.c

	VPATH+= ../../../external/zlib/src
	SRCS+= adler32.c
	SRCS+= compress.c
	SRCS+= crc32.c
	SRCS+= deflate.c
	SRCS+= infback.c
	SRCS+= inffast.c
	SRCS+= inflate.c
	SRCS+= inftrees.c
	SRCS+= trees.c
	SRCS+= uncompr.c
	SRCS+= zutil.c

	CPPFLAGS+= -DADB_HOST=1
	CPPFLAGS+= -DHAVE_FORKEXEC=1
	CPPFLAGS+= -DHAVE_SYMLINKS
	CPPFLAGS+= -DHAVE_TERMIO_H
	CPPFLAGS+= -DHAVE_OFF64_T
	CPPFLAGS+= -D_GNU_SOURCE
	CPPFLAGS+= -D_XOPEN_SOURCE
	CPPFLAGS+= -DWORKAROUND_BUG6558362
	CPPFLAGS+= -I.
	CPPFLAGS+= -I../include
	CPPFLAGS+= -I../../../external/zlib

	CFLAGS+= -O2 -g -Wall -Wno-unused-parameter
	#LDFLAGS= -static
	LIBS= -lrt -lpthread -lcrypto -lssl

	TOOLCHAIN=
	CC= $(TOOLCHAIN)gcc
	LD= $(TOOLCHAIN)gcc

	OBJS= $(SRCS:.c=.o)

	all: adb

	adb: $(OBJS)
	$(LD) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)

	clean:
	rm -rf $(OBJS)