Merge esp32 platform support