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

* commit '2b9d34e13250d8da0f40afeb9b5793355117f4d1':
  Fix gdbclient to work with emulator builds