Merge "aboot: cleanup fastboot related logic"