am f65354a9: Merge "Add bare-bones encryption support to e2fsck"

* commit 'f65354a9736d5ac4ed2b2676715a9298f4b2eb1b':
  Add bare-bones encryption support to e2fsck