Merge "Catch egl errors when drawIntoSurfaces" am: 7604961e1d
am: 3bfa2ca8ea

Change-Id: Ia44f88a6924aaf3f58661783b797f1d64da2f5ad