cleanup/merge: error_invalid_uboot_dtb -> error_invalid_dtb

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