Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev