Reverted a lot of stuff - adb working somtimes (not reproducible).

Change-Id: I5dcff6baaef97555d32c1f7357c6a99fbcc16825