fvp_mps2.jinja2: Switch to fvp_arm_std_library_11.22_14 image

As supporting UBL licensing. Recent FVP_MPS2_AEMv8M versions aren't
provided as seperate packages, but instead included with many other
models in FVP_ARM_Std_Library package.

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: Ieccc49fcea646dd59d2455717d313d40b1917fcd
diff --git a/lava_helper/jinja2_templates/fvp_mps2.jinja2 b/lava_helper/jinja2_templates/fvp_mps2.jinja2
index c72bc87..d650670 100644
--- a/lava_helper/jinja2_templates/fvp_mps2.jinja2
+++ b/lava_helper/jinja2_templates/fvp_mps2.jinja2
@@ -33,14 +33,14 @@
     namespace: docker
     method: fvp
     docker:
-      name: {{ docker_prefix }}/fvp:fvp_mps2_aemv8m_11.16_16
+      name: {{ docker_prefix }}/fvp:fvp_arm_std_library_11.22_14
       local: true
     prompts:
     - 'root@lava '
 {%- if enable_code_coverage %}
     image: /usr/bin/stdout-flush-wrapper.sh
 {%- else %}
-    image: /opt/model/FVP_MPS2_AEMv8M/models/Linux64_GCC-6.4/FVP_MPS2_AEMv8M
+    image: /opt/model/FVP_ARM_Std_Library/FVP_MPS2/FVP_MPS2_AEMv8M
 {%- endif %}
     timeout:
       minutes: 10
@@ -54,7 +54,7 @@
     license_variable: '{{ license_variable }}'
     arguments:
 {%- if enable_code_coverage %}
-    -  "/opt/model/FVP_MPS2_AEMv8M/models/Linux64_GCC-6.4/FVP_MPS2_AEMv8M"
+    -  "/opt/model/FVP_ARM_Std_Library/FVP_MPS2/FVP_MPS2_AEMv8M"
 {%- endif %}
     -  "--simlimit 900"
     -  "--application cpu0={APP}"