Revert "Support building a combined boot image with custom OTA packaging tool"

This reverts commit dd583bd14087bf865d014019b107bf58dd8a8ab2.