GLES1RICE: Update from upstream