envsetup: Create remotes with build if repo is build/make

Google moved the repo on O and its causing chaos with
aospremote and cafremote

Change-Id: Ie8b02d21c981cabfc95e7c2545194e79734c4de6

build/envsetup.sh

@@ -291,6 +291,11 @@ function aospremote()
     fi
     git remote rm aosp 2> /dev/null
     local PROJECT=$(pwd -P | sed -e "s#$ANDROID_BUILD_TOP\/##; s#-caf.*##; s#\/default##")
+    # Google moved the repo location in Oreo
+    if [ $PROJECT = "build/make" ]
+    then
+        PROJECT="build"
+    fi
     if (echo $PROJECT | grep -qv "^device")
     then
         local PFX="platform/"
@@ -308,6 +313,11 @@ function cafremote()
     fi
     git remote rm caf 2> /dev/null
     local PROJECT=$(pwd -P | sed -e "s#$ANDROID_BUILD_TOP\/##; s#-caf.*##; s#\/default##")
+     # Google moved the repo location in Oreo
+    if [ $PROJECT = "build/make" ]
+    then
+        PROJECT="build"
+    fi
     if (echo $PROJECT | grep -qv "^device")
     then
         local PFX="platform/"