Merge "aboot: Fix issue with secure boot"