Merge "aboot: improve appended device tree support"