am 6685bd01: am 2476ec99: Merge "use ext4 instead of yaffs for the emulator"

* commit '6685bd01a953a550f0cebe342e9a1125adffd6b3':
  use ext4 instead of yaffs for the emulator