Merge "e2fsck missing from emulator"