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

* commit '06d914c84119acd7059ee0e76aac8fc703ce83c1':
  e2fsck missing from emulator