Merge "BootLib: Add command line support for Non A/B"