Merge "plat/arm/sgi: update mmap and xlat count" into integration