Merge "bl31: Split into two separate memory regions" into integration