Merge "Add missing termios defns to bring on par with ARM"