Fix Android SDK related build scripts.

AppVeyor now locates Android SDK under %ProgramFiles(x86)%Android,
and the directory cannot be accessed from powershell.
So, this commit change android.bat path and its execution source.

Author: yfakariya

appveyor-debug.yml

@@ -2,31 +2,20 @@ version: '{branch}-{build}'
 image: Visual Studio 2017
 skip_tags: true
 configuration: Debug
-init:
-- cmd: >-
-    cd \
-
-    appveyor DownloadFile http://dl.google.com/android/android-sdk_r24.4.1-windows.zip
-
-    7z x android-sdk_r24.4.1-windows.zip > nul
-
-    cd %APPVEYOR_BUILD_FOLDER%
 assembly_info:
   patch: true
   file: '**\*AssemblyInfo.cs'
   assembly_version: $(AssemblyBaseVersion).0
   assembly_file_version: $(AssemblyBaseVersion).{build}
   assembly_informational_version: $(PackageVersion)
-environment:
-  ANDROID_HOME: C:\android-sdk-windows
 install:
-- ps: >-
-    cd ./build
+- cmd: >-
+    cd .\build
 
+    UpdateAndroidSdk.cmd
+- ps: >-
     ./SetBuildEnv.ps1
 
-    ./UpdateAndroidSdk.cmd
-
     cd ..
 build_script:
 - ps: >-

appveyor-release.yml

@@ -5,31 +5,20 @@ branches:
   - master
   - 0.7
 configuration: Release
-init:
-- cmd: >-
-    cd \
-
-    appveyor DownloadFile http://dl.google.com/android/android-sdk_r24.4.1-windows.zip
-
-    7z x android-sdk_r24.4.1-windows.zip > nul
-
-    cd %APPVEYOR_BUILD_FOLDER%
 assembly_info:
   patch: true
   file: '**\*AssemblyInfo.cs'
   assembly_version: $(AssemblyBaseVersion).0
   assembly_file_version: $(AssemblyBaseVersion).{build}
   assembly_informational_version: $(PackageVersion)
-environment:
-  ANDROID_HOME: C:\android-sdk-windows
 install:
-- ps: >-
-    cd ./build
+- cmd: >-
+    cd .\build
 
+    UpdateAndroidSdk.cmd
+- ps: >-
     ./SetBuildEnv.ps1
 
-    ./UpdateAndroidSdk.cmd
-
     cd ..
 build_script:
 - ps: >-

build/UpdateAndroidSdk.cmd

@@ -1 +1 @@
-echo y | "%ANDROID_HOME%/tools/android.bat" --silent update sdk --no-ui --all --filter android-10,android-23,platform-tools,tools,build-tools-23.0.3
+echo y | "%ProgramFiles(x86)%\Android\android-sdk\tools\android.bat" --silent update sdk --no-ui --all --filter android-10,platform-tools,tools,build-tools-23.0.3