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

Change-Id: Ia7ee18f30fe755eb0c8bbcd844a847d0c5f9d473