Merge "TF-A: Add build option for Arm Feature Modifiers" into integration