Merge "Fix gles3jni build with clang at android-11"