Merge "EGL: add the EGL_ANDROID_framebuffer_target enum" into jb-mr1-dev