Merge "aboot: Remove goto from aboot_init()"