ANDROID: GKI: fix up crc issue in crypto_get_default_null_skcipher()

In commit e307c54a ("crypto: null - Use spin lock instead of
mutex"), the .h files get shuffled around a bit, which causes a CRC
mismatch in crypto_get_default_null_skcipher().  Put them back to the
way they were if we are calculating crcs, to keep the build clean.

Bug: 161946584
Fixes: e307c54a ("crypto: null - Use spin lock instead of mutex")
Change-Id: I7d1490944efbbd3bdc99e4116014b5f32ab3d708
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>