am d23bd8f5: Merge "e2fsck missing from emulator"

* commit 'd23bd8f59f396ecd23a54d4e9b798bc872a2e505':
  e2fsck missing from emulator