Merge branch 'fix-android-build-server-aapt2-failure' into 'develop'

Add gcompat glibc compatibility layer required by Android build tools.

See merge request !106