Merge "gdbclient: fix darwin sed problem" am: 37df8f4175 am: a49ad2deed
am: 2214dd5012

Change-Id: I8e67d6b7a1bd605e5efb106cc1c4afe1363d862e