Merge "TF-A: Redefine true/false definitions" into integration