Merge "adb: fix device module for non-shell_v2 usage."
am: fbc9027558

* commit 'fbc902755869a2f1dbebc7074740e8bd9618b206':
  adb: fix device module for non-shell_v2 usage.