DO NOT MERGE: Misc changes and enhancements

 * Fix mismerge of bootimage-nodeps
 * Fix mismerge of override-device
 * Add support for custom mkbootimage

Change-Id: I4e78237b7137b77fa3cb9c8db13a4271bef7e23d