Merge "Backport the inlines for cfsetspeed and tcdrain." am: efb1cb1089
am: acb56b07eb

Change-Id: If3a39222aa95bad96d5103f7355e6de22de17ceb