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

* commit '403346a85085804c1de6c2586342aa90c4521f19':
  e2fsck missing from emulator