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

* commit 'ab49c9ac69e71019312fb43e0b38b14a8cd66349':
  Fix gdbclient to work with emulator builds