Merge "Restore __srget and __swbuf for LP32."