Merge "support for ext4/EMMC in target_files and OTA generation"