Merge "add support for EGL_FRAMEBUFFER_TARGET_ANDROID" into jb-mr1-dev