Remove the carveouts to align with memory map v4. Change-Id: I7d495beb819789aaa71b7e85a0d2ef56c0bed67b