Merge Trusted Firmware-A v2.4 release

Change-Id: I0dd560e971ff89ca12f08544337db53560502412