Merge "el3_entrypoint_common: avoid overwriting arg3" into integration