Add xml-port support.

Dockerfile

@@ -17,6 +17,9 @@ RUN mkdir ${CTC_FOLDER}
 RUN mkdir ${CTC_FOLDER}/tools
 RUN wget -O ${CTC_FOLDER}/tools/apktool.jar https://f001.backblazeb2.com/file/avepub/apktool-cli-all.jar
 
+# Grab xml-patch (https://github.com/dnault/xml-patch)
+RUN wget -O ${CTC_FOLDER}/tools/xml-patch.jar https://jcenter.bintray.com/com/github/dnault/xml-patch/0.3.1/xml-patch-0.3.1.jar
+
 # Grab emoji sets
 ENV EMOJI_PATH=${CTC_FOLDER}/emojis
 ENV EMOJI_MUTANT_PATH=${EMOJI_PATH}/mutant
@@ -49,14 +52,10 @@ RUN keytool -genkey -alias test \
     -dname "CN=Test, OU=Test, O=Test, L=Test, S=Test, C=Test" \
     -storepass password -keypass password
 
-# Git will moan about this otherwise..
-RUN git config pull.rebase false
-
 # Make folder for git repo
 RUN mkdir ${CTC_FOLDER}/gitrepo
 WORKDIR ${CTC_FOLDER}/gitrepo
 
-
 # paths in ctcconfig in docker
 # container							fs
 # /opt/ctc/gitrepo