Update skia scripts to stable branch, use param for the android skia script

skia/dependencies/make_skia.sh

diff --git a/skia/dependencies/make_skia.sh b/skia/dependencies/make_skia.sh
index 598d04e..d4c1c41 100755
--- a/skia/dependencies/make_skia.sh
+++ b/skia/dependencies/make_skia.sh
@@ -9,7 +9,7 @@
 # GLFW requires CMake
 
 SKIA_REPO=https://github.com/google/skia
-SKIA_STABLE_BRANCH=chrome/m87
+SKIA_STABLE_BRANCH=chrome/m95
 
 # -----------------------------
 # Get & Build Skia
@@ -53,7 +53,6 @@
     skia_use_gl=true \
     skia_use_zlib=true \
     skia_use_system_zlib=false \
-    skia_enable_ccpr=true \
     skia_enable_gpu=true \
     skia_enable_fontmgr_empty=false \
     skia_enable_spirv_validation=false \

skia/dependencies/make_skia_android.sh

diff --git a/skia/dependencies/make_skia_android.sh b/skia/dependencies/make_skia_android.sh
index edffeb2..45beb90 100755
--- a/skia/dependencies/make_skia_android.sh
+++ b/skia/dependencies/make_skia_android.sh
@@ -15,30 +15,73 @@
 # Get & Build Skia
 # -----------------------------
 if [ ! -d skia ]; then
-    echo "Cloning Skia stable branch."
-    # TODO:(umberto) --depth 1
-    git clone -b $SKIA_STABLE_BRANCH $SKIA_REPO
+    echo "Cloning Skia stable branch..."
+    # TODO:(umberto) --depth 1 test
+    git clone -b $SKIA_STABLE_BRANCH --depth 1 $SKIA_REPO
+fi
+
+ARCH=$1
+
+if [ "$ARCH" != "x86" ] &&
+    [ "$ARCH" != "x64" ] &&
+    [ "$ARCH" != "arm" ] &&
+    [ "$ARCH" != "arm64" ]; then
+    printf "Invalid architecture: '%s'. Choose one between 'x86', 'x64', 'arm', or 'arm64'" "$ARCH"
+    exit 1
 fi
 
 cd skia
 
 python tools/git-sync-deps
 
-# TODO: Pass these as arguments.
-# ARCH=x86
-ARCH=x64
-# ARCH=arm
-# ARCH=arm64
-
-# Useful for debugging the build process.
+# Useful for debugging:
 # bin/gn args --list out/${ARCH}
-bin/gn gen out/${ARCH} --args=" \
+
+bin/gn gen out/"${ARCH}" --args=" \
     ndk=\"${NDK_PATH}\" \
     target_cpu=\"${ARCH}\" \
-    is_official_build=false \
+    is_official_build=true \
     skia_use_egl=true \
     skia_use_gl=true \
-    skia_gl_standard=\"gles\" \
+    skia_gl_standard=\"gles\" 
+    \
+    skia_use_freetype=false \
+    skia_use_libjpeg_turbo_decode=false \
+    skia_use_libjpeg_turbo_encode=false \
+    skia_use_libpng_decode=false \
+    skia_use_libpng_encode=false \
+    skia_use_libwebp_decode=false \
+    skia_use_libwebp_encode=false \
+    skia_use_libgifcodec=false \
+    skia_enable_pdf=false \
+    skia_enable_svg=false \
+    skia_enable_skrive=false \
+    skia_enable_skshaper=false \
+    skia_enable_sksl=false \
+    skia_enable_sktext=false \
+    skia_enable_skottie=false \
+    skia_enable_skparagraph=false \
+    skia_enable_particles=false \
+    skia_pdf_subset_harfbuzz=false \
+    skia_use_fixed_gamma_text=false \
+    skia_use_piex=false \
+    skia_use_sfntly=false \
+    skia_use_xps=false \
+    skia_use_x11=false \
+    skia_use_fontconfig=false \
+    skia_use_system_expat=false \
+    paragraph_tests_enabled=false \
+    \
+    skia_use_angle=false \
+    skia_use_dng_sdk=false \
+    skia_use_expat=false \
+    skia_use_icu=false \
+    skia_use_libheif=false \
+    skia_use_lua=false \
+    skia_use_zlib=true \
+    skia_enable_fontmgr_empty=false \
+    skia_enable_spirv_validation=false \
     "
-ninja -C out/${ARCH}
+
+ninja -C out/"${ARCH}"
 cd ..

skia/viewer/build.sh

diff --git a/skia/viewer/build.sh b/skia/viewer/build.sh
index b247535..0ff8326 100755
--- a/skia/viewer/build.sh
+++ b/skia/viewer/build.sh
@@ -25,5 +25,3 @@
 else
     premake5 gmake && make -j7
 fi
-
-set +e
\ No newline at end of file