am 250e03f2: am 403346a8: am 06d914c8: am d23bd8f5: Merge "e2fsck missing from emulator"

* commit '250e03f2a10956ad05d94c348957b01ccff3ad46':
  e2fsck missing from emulator