Merge changes I92826714,I9431f9d1 into integration

* changes:
  build(psci): move `runtime_errata.S` to PSCI
  build: allow BL-specific includes/definitions