Improve the C3 CPU identification. I didn't notice that the CPU id
was masked. However KIMURA Yasuhiro-san noticed my mistake and was
kind enough to provide a better patch in PR 55581. I've merged that
into the routine. Hopefully I've not overlooked anything this time.

MFC After: 5 days