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

Change-Id: If8ccc1588f4005ba1c5d8903e8cc7ca0d79b8958