The first revision of `.clang-format` missed some necessary include
grouping options for the recently-introduced architecture headers.

Change-Id: I92eeeb6ee94693d129502a1ddc873f77fb0b408d
Signed-off-by: Chris Kay <chris.kay@arm.com>