am 43946da5: am 7f45e7c1: Merge "emulator: oops, really fix the build"

* commit '43946da54d3dc8d840c5e39c8eaf2f46ece57518':
  emulator: oops, really fix the build