Merge "Add support for packaging gdbserver in the apk in Ant." into eclair