This reverts commit 02a5231b. Upstream mkimage has not yet take patches to support packaging multiple kernels to ISO image. In order to avoid problems, have to revert this commit.