Merge "Switch adb over to <chrono>." am: 59826ddee5
am: 2278b50f24

Change-Id: I91e3f9d5784d3c7110a605115b247f71f68d6fe3