Merge "adb: switch from system_clock to steady_clock." am: 278754aeac
am: f2dd09ff5b

Change-Id: I3bdae32bb3350e3b1137f43b32559e9a13331b40