Merge "Unify type of "cpu_idx" across PSCI module." into integration