am 6fa169fa: Merge "Add aarch64 EGL/GLES trampolines"

* commit '6fa169faa955ecc47872557a5d4fd89a95190d5e':
  Add aarch64 EGL/GLES trampolines