Merge "Hook incremental ext4 image generation into build" into nyc-dev