Merge "app: aboot: Fix return statements in cmd_boot function" into kk_3.5