Merge Trusted Firmware-A v2.5 release

Change-Id: I97d35685a9d2253feca2dbba27f1bed85119c77f