Cleaning support for gles2; update version of xwl.