Fix C2PAP after batch system interface change.

Fix the C2PAP submodule after the batch system was upgraded and the interface
has been slightly changed.