Retcon recent header fixes needed to build gdbserver.

Bug: http://b/21695943
Change-Id: I2b2f0e21a66093bdbbdbc0320ffa574eefaaf5fa
2 files changed