Merge "Fix location of gdbserver upon installation" into gingerbread