Merge "Run e2fsck only when building images with the target files." into jb-mr2-dev