am 620a5401: am a42f152b: Merge "rootdir: Fix system emulation startup." into honeycomb

* commit '620a540128ace4514a5695bdfa94b9f409c7a605':
  rootdir: Fix system emulation startup.