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