Added CMAccount and Droidwall to the build