Add quilt to prereqs

Also move git to where it belongs.

Change-Id: I2509306a6f51d24873807fe18aee3a8cb6a373bb
diff --git a/Dockerfile b/Dockerfile
index 8f51e18..f781e44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,6 @@
         apt-transport-https \
         ca-certificates \
         curl \
-        git \
         lxc \
         iptables
 RUN curl -sSL https://get.docker.com/ | sh
diff --git a/prereqs.mk b/prereqs.mk
index 2cd6cdb..30802c4 100644
--- a/prereqs.mk
+++ b/prereqs.mk
@@ -17,6 +17,7 @@
 	equivs \
 	fakeroot \
 	genext2fs \
+	git \
 	kpartx \
 	libcap-dev \
 	libwayland-dev \
@@ -28,6 +29,7 @@
 	python2.7 \
 	python3 \
 	qemu-user-static \
+	quilt \
 	reprepro \
 	rsync \
 	xz-utils \