emmc-image: misc fix for logs and cleanup
This fixes some logs in error conditions, also there is no need to stop
services if the merge did not happen.
Tested: Logs can be printed correctly and cleanup still works
Platforms-Affected: eMMC image platforms
Fusion-Link: fusion2 N/A only affects certain platforms
Google-Bug-Id: 439627429
Change-Id: I73d9eac206c33de64f55df9e231796aa69592a84
Signed-off-by: Yuxiao Zhang <yuxiaozhang@google.com>
(cherry picked from commit 0a6945141cb148fafd3dc0e11253581d3358010a)
1 file changed
