Merge changes Iecdc1d2c,Id675df1a into lmp-preview-dev

* changes:
  ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
  ndk: Remove extra GLES symbols on 64-bit platforms