android: Pull known good toolchain versions

This includes pulling libSPIRV-Tools-opt into the build
to satisfy new shaderc revision.
diff --git a/build-android/spirv-headers_revision_android b/build-android/spirv-headers_revision_android
index 74846cc..1f7391f 100644
--- a/build-android/spirv-headers_revision_android
+++ b/build-android/spirv-headers_revision_android
@@ -1 +1 @@
-3814effb879ab5a98a7b9288a4b4c7849d2bc8ac
+master