corepkcs11: Refactor Arm Compiler patch

Do not define __PASTE-macro for Arm compiler patch is
modified as the issue that the patch is trying to solve
was already introduced before for Keil Compiler so, the
condition is just modified to add Arm Compiler too.

This is done to be able to push this patch upstream.

Signed-off-by: Ahmed Ismail <Ahmed.Ismail@arm.com>