am 9557358d: Merge "Fix linking error for Win64 emulator executable"

* commit '9557358d1658dfa875754e1c2f441b4297b5aef8':
  Fix linking error for Win64 emulator executable