Consolidate adb helper methods into single class. am: 6927faf7e6
am: ef746d4726

Change-Id: I2d783da5afb321ccc058922b9694950477540bf8