embedded-a/corstone1000: Fix clean secure flash patch

Fix the clean secure patch so it can be applied cleanly even there are new
out-of-tree patches in meta-arm.

Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>