Merge "libfs_mgr_binder: Cleanup GetGsiService()"