am 6fdc2791: Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so"

* commit '6fdc2791028c283f2068fcc935fb7928374e19c1':
  ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so