Merge "GLSurfaceView defaults to 888 instead of 565" into jb-mr1-dev