Merge "fix(fvp): unconditionally include lib/psa headers" into integration