Merge "Switch adb over to <chrono>."