am 4b542afe: am ba000511: Merge "adbd: Add os descriptor support for adb."

* commit '4b542afe05beb3820b980358e5d5eaba8a46e292':
  adbd: Add os descriptor support for adb.