Refactorings to match adb_abb to adb_shell code.

Test: Build, flash and boot, use `adb abb` to verify

Change-Id: I30eb6e8a4fd43b1548a9398376c72e2cb31223a4
1 file changed