Merge "Updating ISurfaceComposer to report errors"