Merge "Add aarch64 EGL/GLES trampolines"