Merge commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb' * commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb': fix [2421247] implement eglGetProcAddress(), needed in the ndk
Merge commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb' * commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb': fix [2421247] implement eglGetProcAddress(), needed in the ndk