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

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