Mix in a role with the single serialization "hack", instead of using a custom NQP branch.

Update the nqp submodule.
Update the serialization format version to 6.