Merge "fix(rme/fid): align RMI FIDs with SMCCC"