Put kNumSafepointRegisters back to 32.
(The cp register is 20, and there is code that depends on
accessing relative to the savepoint safe area by register
offset.)