Merge "Catch egl errors when drawIntoSurfaces" into pie-gsi