NDK EGL: Copy android-21 to android-23

Change-Id: Ie3bded59979f02dea706fa349f6d7b72b2538d1a
15 files changed