Prebuilts: TF-A to enable tests for SPMC

Prebuilts was updated with TF-A binary for the SPMC tests, and
folder "arm-trusted-firmware" was renamed to
"arm-trusted-firmware-trusty".
Updated references to "arm-trusted-firmware", to match aforementioned
folder renaming change.

Change-Id: Ica31991fa0b56675c98e26508d74081ed0f65f8f
Signed-off-by: J-Alves <joao.alves@arm.com>
diff --git a/test/hftest/hftest.py b/test/hftest/hftest.py
index 06fb719..2434dcb 100755
--- a/test/hftest/hftest.py
+++ b/test/hftest/hftest.py
@@ -39,7 +39,7 @@
     os.path.dirname(HF_ROOT), "fvp", "Base_RevC_AEMv8A_pkg", "models",
     "Linux64_GCC-4.9", "FVP_Base_RevC-2xAEMv8A")
 FVP_PREBUILTS_ROOT = os.path.join(
-    HF_ROOT, "prebuilts", "linux-aarch64", "arm-trusted-firmware", "fvp")
+    HF_ROOT, "prebuilts", "linux-aarch64", "trusted-firmware-a-trusty", "fvp")
 FVP_PREBUILT_DTS = os.path.join(
     FVP_PREBUILTS_ROOT, "fvp-base-gicv3-psci-1t.dts")
 FVP_PREBUILT_BL31 = os.path.join(FVP_PREBUILTS_ROOT, "bl31.bin")
@@ -208,7 +208,7 @@
         if self.tfa:
             exec_args += ["-bios",
                 os.path.abspath(
-                    "prebuilts/linux-aarch64/arm-trusted-firmware/qemu/bl1.bin"
+                    "prebuilts/linux-aarch64/trusted-firmware-a-trusty/qemu/bl1.bin"
                 ), "-machine", "secure=on", "-semihosting-config",
                 "enable,target=native"]