Revert r364939 and add a stable/12 approach for populating the ESP

make_esp_file is not available in stable/12 so r364939 broke VM-related targets.
Revert offending commit and use pre-r342283 approach to populate ESP partition.

PR: 249168
Tested on: VirtualBox, Hyper-V v2 VM