am aff30c9b: am 99f8c5ee: Merge "Fix location of gdbserver upon installation" into gingerbread

Merge commit 'aff30c9b0db2c4e28afbe83436ab9024b67665cf'

* commit 'aff30c9b0db2c4e28afbe83436ab9024b67665cf':
  Fix location of gdbserver upon installation