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

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