Merge "SurfaceFlinger: use V2_4::Error in ComposerHal"