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

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