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

* commit 'd960239de6371c2368792c6cc75de6d59abe172c':
  emulator: oops, really fix the build