Merge "adb: Remove usages of ENDPOINT_ALLOC" am: 4fa763290e am: e15fb6b9d5
am: 7c97b17a59

Change-Id: Ie5a80a53680526847700c9cd0f8f1f05e443af48