ANDROID: cpu/hotplug: avoid breaking Android ABI by fusing cpuhp steps

We can't add more values to the cpuhp_state enum, lest we break some
vendor module. So instead break out existing steps into helper functions
which call both steps. Fortunately none of these steps return anything
other than 0, so we don't need to worry about rollback.

Bug: 161946584
Fixes: 5064550d422d ("random: clear fast pool, crng, and batches in cpuhp bring up")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Icaa61291207d799bab741be7bab2b636cda09422
(cherry picked from commit 2c26b627277ef5ac79cfe10cf8183373ddddc4da)
Signed-off-by: Eric Biggers <ebiggers@google.com>