Merge "app: aboot: Add support for secure and variant"