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

* commit '3d1f08375865a75ab6f67a45967cf9ad0c19ef72':
  ndk: Remove extra GLES symbols on 64-bit platforms