am 931bdcc0: Set explicit timeout on USB control transfer

Merge commit '931bdcc09a3d805cf25033951adb95c8e5159e46' into gingerbread-plus-aosp

* commit '931bdcc09a3d805cf25033951adb95c8e5159e46':
  Set explicit timeout on USB control transfer