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

Change-Id: I5c37f68e07bdd9bd9a9febf99b18893fde4ab8ac