Merge "Add an option to include a full bootloader in incremental OTA."