Create a merged XBridgeFactory2 interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.

Change-Id: I7309f4d30f0e772bc203c701eb3407b920ffafcc