Merge "refactor(plat/arm): replace FIP base and size macro with a generic name" into integration