Merge "Revert "adb: Lower EP_ALLOC retry count""