Merge "merge libsurfaceflinger_client into libgui"