Merge "use ext4 instead of yaffs for the emulator"