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

Change-Id: I32e0503ee15061a1f7b35086b2d7bd4bbc52d094