Make the kernel image format parametric instead of a chain of if/elses

Change-Id: I54bfcdecb8647f7bcf744e72b2de19fcf4e4e7ac
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0