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