Correct placement of CI files and other changes that were missed. (#232)

Author: MaitreyaBuddha

Makefile

@@ -24,7 +24,7 @@ shell:
 	${DOCKER_RUN} bash
 
 build-image:
-	docker build -t ${SDK_BUILD_IMAGE} . -f jenkins/build.dockerfile
+	docker build -t ${SDK_BUILD_IMAGE} . -f Tools/jenkins/build.dockerfile
 	docker push ${SDK_BUILD_IMAGE}
 
 .PHONY: build

jenkins/build.dockerfile renamed to Tools/jenkins/build.dockerfile

@@ -7,13 +7,10 @@ ARG platform_image="platforms;${emulator_platform}"
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \
   nodejs=6.11.4~dfsg-1ubuntu1 \
-  npm \
   build-essential \
   && rm -rf /var/lib/apt/lists/*
 
 ENV PATH="$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin"
 
-RUN npm install -g yarn
-
 RUN sdkmanager emulator tools platform-tools ${platform_image} ${system_image} --verbose && \
   echo no | avdmanager create avd -n "device1" --package ${system_image} --tag google_apis

jenkins/Jenkinsfile renamed to Tools/jenkins/pipelines/ci.groovy

@@ -18,7 +18,9 @@ pipeline {
 }
 
 def buildAndTest() {
-    def buildImage = docker.build("leanplum/android-sdk-build", "-f ./jenkins/build.dockerfile .")
+    def buildImage = docker.build(
+        "leanplum/android-sdk-build",
+         "-f ./Tools/jenkins/build.dockerfile .")
     buildImage.inside {
         sh 'make sdk'
     }