[payment-builder] cleanup, intr PaymentBuilder and PaymentFactory interfaces.