Merge "NDK updates for EGL 1.5"