am 73371e58: Merge "Fix gdbclient to work with emulator builds"

* commit '73371e581be72ea766a3170b3b647a28484ae69e':
  Fix gdbclient to work with emulator builds