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

* commit '6f05aa44ecfadc12a9f23a16ecf92b9ffbe0aa04':
  Run e2fsck only when building images with the target files.