Merge "Retcon recent header fixes needed to build gdbserver."