Merge "SurfaceComposerClient: Ensure createSurface returns error codes." into pi-dev