Merge "ndk: Remove extra GLES symbols on 64-bit platforms"