am cd11be09: (-s ours) am 9205fdf8: Add missing termios defns to bring on par with ARM - DO NOT MERGE