Update to memory map v4. Additionally, sort hwfence-shmem and tz_merged_region in ascending order. Change-Id: Ia45a28a1f0f0025cad0c947d19f2c27dcf94516a Signed-off-by: Patrick Daly <quic_pdaly@quicinc.com>