Merge "adbd: Add os descriptor support for adb."