cleanup: sync with omap-image-builder

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>