Update nacl to shortscalarmult branch.