am 18dc709e: Merge "Fix gles3jni build with clang at android-11"

* commit '18dc709e82337c34c9bf6389bfe9bab357d98477':
  Fix gles3jni build with clang at android-11