am fec153a7: am 9765cb8a: am 2a59fa7d: Merge "emulator: fix the build"

* commit 'fec153a765edf051f3b97610c748d1ab9526cbfa':
  emulator: fix the build