Merge branch 'feature/move_memory_layout_to_heap' into 'master'

G0: Memory layouts are now part of heap components

Closes IDF-1264

See merge request espressif/esp-idf!14028

components/esp_hw_support/include/soc/compare_set.h

@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "soc/cpu.h"
-#include "soc/soc_memory_layout.h"
+#include "soc/soc_memory_types.h"
 
 #if __XTENSA__
 #include "xtensa/xtruntime.h"

components/esp_hw_support/include/soc/spinlock.h

@@ -18,7 +18,6 @@
 #include "sdkconfig.h"
 #include "soc/cpu.h"
 #include "hal/cpu_hal.h"
-#include "soc/soc_memory_layout.h"
 #include "soc/compare_set.h"
 
 #if __XTENSA__