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

* commit '8e6abbc394a866d04c38a619040ce4b17038658e':
  adbd: Add os descriptor support for adb.