Merge branch 'develop' into 'master'

fix android build server aapt2 failure

See merge request !107

android-build-server/Dockerfile

@@ -17,7 +17,7 @@ ENV ANDROID_HOME /opt/android-sdk-linux
 ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/latest/bin
 
 WORKDIR /opt
-RUN apk add --no-cache curl bash unzip libstdc++ su-exec
+RUN apk add --no-cache curl bash unzip libstdc++ su-exec gcompat
 RUN mkdir -p /opt/android-sdk-linux/cmdline-tools \
     && curl -q -o commandlinetools.zip -L https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip \
     && unzip -q commandlinetools.zip -d ${ANDROID_HOME}/cmdline-tools \