Merge "TFTF: Add build option for Arm Feature Modifiers"