fix: update patch files to apply cleanly

After recent changes in bl31 code few of the patch files are not
applied cleanly, update the patch files.

Signed-off-by: Manish Pandey <manish.pandey2@arm.com>
Change-Id: Ied51bd963c80ecf5c23f2cc310221f79dc32930d
diff --git a/patch/ubsan/ubsan_test.patch b/patch/ubsan/ubsan_test.patch
index 619f817..c452e6b 100644
--- a/patch/ubsan/ubsan_test.patch
+++ b/patch/ubsan/ubsan_test.patch
@@ -1,5 +1,5 @@
 diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
-index c8cc2c7199..18ae4bdfa0 100644
+index 8c5ba6f2e..21ed3b686 100644
 --- a/bl31/bl31_main.c
 +++ b/bl31/bl31_main.c
 @@ -112,6 +112,19 @@ void bl31_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2,
@@ -22,10 +22,10 @@
  /*******************************************************************************
   * BL31 is responsible for setting up the runtime services for the primary cpu
   * before passing control to the bootloader or an Operating System. This
-@@ -223,6 +236,10 @@ void bl31_main(void)
- 	PMF_CAPTURE_TIMESTAMP(bl_svc, BL31_EXIT, PMF_CACHE_MAINT);
+@@ -224,6 +237,10 @@ void bl31_main(void)
+ 
  	console_flush();
- #endif
+ 	console_switch_state(CONSOLE_FLAG_RUNTIME);
 +
 +	/* Run UBSAN Test */
 +	INFO("BL31: Running UBSAN test\n");