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

Change-Id: If5c68284b3f072781aa9a981492498b6d1492060