Update the carveouts to align with memory map v6. Change-Id: I052828124195164bab5003b4788aa297ddf8953f