Merge "Fix gdbclient to work with emulator builds"