GLES2RICE: Update from upstream